From 62ac9611910d7db2e6e46443a301505f6f93dfe3 Mon Sep 17 00:00:00 2001 From: sachin <56427366+sachin071287@users.noreply.github.com> Date: Sat, 28 May 2022 08:48:22 +0530 Subject: [PATCH 1/7] BAEL-4292:Play sound in java (#12004) * BAEL-4292:Play sound in java * BAEL-4292:Play sound in java * BAEL-4292: Play sound in java * BAEL-4292:Play sound in java * BAEL-4292:Play sound in java * BAEL-4292:Play sound in java * fix for spaces Co-authored-by: Sachin kumar --- javax-sound/pom.xml | 37 +++++++++ .../com/baeldung/SoundPlayerUsingClip.java | 77 ++++++++++++++++++ .../com/baeldung/SoundPlayerUsingJavaFx.java | 39 +++++++++ .../baeldung/SoundPlayerUsingJavaZoom.java | 30 +++++++ .../SoundPlayerUsingSourceDataLine.java | 59 ++++++++++++++ .../main/resources/AudioFileWithMp3Format.mp3 | Bin 0 -> 37450 bytes pom.xml | 2 + 7 files changed, 244 insertions(+) create mode 100644 javax-sound/pom.xml create mode 100644 javax-sound/src/main/java/com/baeldung/SoundPlayerUsingClip.java create mode 100644 javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaFx.java create mode 100644 javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaZoom.java create mode 100644 javax-sound/src/main/java/com/baeldung/SoundPlayerUsingSourceDataLine.java create mode 100644 javax-sound/src/main/resources/AudioFileWithMp3Format.mp3 diff --git a/javax-sound/pom.xml b/javax-sound/pom.xml new file mode 100644 index 0000000000..7b5fabb9a7 --- /dev/null +++ b/javax-sound/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + com.baeldung.javax-sound + javax-sound + 1.0-SNAPSHOT + javax-sound + jar + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + javazoom + jlayer + ${javazoom.jlayer.version} + + + org.openjfx + javafx-controls + ${org.openjfx.version} + + + org.openjfx + javafx-media + ${org.openjfx.version} + + + + 11.0.2 + 1.0.1 + + \ No newline at end of file diff --git a/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingClip.java b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingClip.java new file mode 100644 index 0000000000..6f7ec4013f --- /dev/null +++ b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingClip.java @@ -0,0 +1,77 @@ +package com.baeldung; + +import java.io.IOException; +import java.io.InputStream; + +import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.AudioInputStream; +import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.Clip; +import javax.sound.sampled.DataLine; +import javax.sound.sampled.LineEvent; +import javax.sound.sampled.LineListener; +import javax.sound.sampled.LineUnavailableException; +import javax.sound.sampled.UnsupportedAudioFileException; + +public class SoundPlayerUsingClip implements LineListener { + + boolean isPlaybackCompleted; + + @Override + public void update(LineEvent event) { + + if (LineEvent.Type.START == event.getType()) { + System.out.println("Playback started."); + } else if (LineEvent.Type.STOP == event.getType()) { + isPlaybackCompleted = true; + System.out.println("Playback completed."); + } + } + + /** + * + * Play a given audio file. + * @param audioFilePath Path of the audio file. + * + */ + void play(String audioFilePath) { + try { + InputStream inputStream = getClass().getClassLoader() + .getResourceAsStream(audioFilePath); + AudioInputStream audioStream = AudioSystem.getAudioInputStream(inputStream); + + AudioFormat format = audioStream.getFormat(); + DataLine.Info info = new DataLine.Info(Clip.class, format); + + Clip audioClip = (Clip) AudioSystem.getLine(info); + audioClip.addLineListener(this); + audioClip.open(audioStream); + audioClip.start(); + while (!isPlaybackCompleted) { + try { + Thread.sleep(1000); + } catch (InterruptedException ex) { + ex.printStackTrace(); + } + } + audioClip.close(); + audioStream.close(); + + } catch (UnsupportedAudioFileException | LineUnavailableException | IOException ex) { + System.out.println("Error occured during playback process:"+ ex.getMessage()); + } + + } + + public static void main(String[] args) { + String audioFilePath = "AudioFileWithWavFormat.wav"; + + // Clip can not play mpeg/mp3 format audio. We'll get exception if we run with below commented mp3 and mpeg format audio. + // String audioFilePath = "AudioFileWithMpegFormat.mpeg"; + // String audioFilePath = "AudioFileWithMp3Format.mp3"; + + SoundPlayerUsingClip player = new SoundPlayerUsingClip(); + player.play(audioFilePath); + } + +} \ No newline at end of file diff --git a/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaFx.java b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaFx.java new file mode 100644 index 0000000000..523376936d --- /dev/null +++ b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaFx.java @@ -0,0 +1,39 @@ +package com.baeldung; + +import javafx.scene.media.Media; +import javafx.scene.media.MediaPlayer; + +public class SoundPlayerUsingJavaFx { + + public static void main(String[] args) { + + // String audioFilePath = "AudioFileWithWavFormat.wav"; + // String audioFilePath = "AudioFileWithMpegFormat.mpeg"; + String audioFilePath = "AudioFileWithMp3Format.mp3"; + SoundPlayerUsingJavaFx soundPlayerWithJavaFx = new SoundPlayerUsingJavaFx(); + + try { + com.sun.javafx.application.PlatformImpl.startup(() -> { + }); + + Media media = new Media(soundPlayerWithJavaFx.getClass() + .getClassLoader() + .getResource(audioFilePath) + .toExternalForm()); + + MediaPlayer mp3Player = new MediaPlayer(media); + mp3Player.setOnPlaying(new Runnable() { + @Override + public void run() { + System.out.println("Playback started"); + } + }); + + mp3Player.play(); + + } catch (Exception ex) { + System.out.println("Error occured during playback process:" + ex.getMessage()); + } + + } +} diff --git a/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaZoom.java b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaZoom.java new file mode 100644 index 0000000000..a7174b29a1 --- /dev/null +++ b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingJavaZoom.java @@ -0,0 +1,30 @@ +package com.baeldung; + +import java.io.BufferedInputStream; + +import javazoom.jl.player.Player; + +public class SoundPlayerUsingJavaZoom { + + public static void main(String[] args) { + + // javazoom Player doesn't work with wav audio format. + // String audioFilePath = "AudioFileWithWavFormat.wav"; + + // It works with below audio formats. + // String audioFilePath = "AudioFileWithMpegFormat.mpeg"; + String audioFilePath = "AudioFileWithMp3Format.mp3"; + SoundPlayerUsingJavaZoom player = new SoundPlayerUsingJavaZoom(); + + try { + BufferedInputStream buffer = new BufferedInputStream(player.getClass() + .getClassLoader() + .getResourceAsStream(audioFilePath)); + Player mp3Player = new Player(buffer); + mp3Player.play(); + + } catch (Exception ex) { + System.out.println("Error occured during playback process:" + ex.getMessage()); + } + } +} diff --git a/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingSourceDataLine.java b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingSourceDataLine.java new file mode 100644 index 0000000000..2b589554c2 --- /dev/null +++ b/javax-sound/src/main/java/com/baeldung/SoundPlayerUsingSourceDataLine.java @@ -0,0 +1,59 @@ +package com.baeldung; + +import java.io.IOException; +import java.io.InputStream; + +import javax.sound.sampled.AudioFormat; +import javax.sound.sampled.AudioInputStream; +import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.DataLine; +import javax.sound.sampled.LineUnavailableException; +import javax.sound.sampled.SourceDataLine; +import javax.sound.sampled.UnsupportedAudioFileException; + +public class SoundPlayerUsingSourceDataLine { + + private static final int BUFFER_SIZE = 4096; + + void play(String soundFilePath) { + try { + InputStream inputStream = getClass().getClassLoader() + .getResourceAsStream(soundFilePath); + AudioInputStream audioStream = AudioSystem.getAudioInputStream(inputStream); + + AudioFormat audioFormat = audioStream.getFormat(); + DataLine.Info info = new DataLine.Info(SourceDataLine.class, audioFormat); + SourceDataLine sourceDataLine = (SourceDataLine) AudioSystem.getLine(info); + sourceDataLine.open(audioFormat); + sourceDataLine.start(); + + System.out.println("Playback Started."); + + byte[] bufferBytes = new byte[BUFFER_SIZE]; + int readBytes = -1; + while ((readBytes = audioStream.read(bufferBytes)) != -1) { + sourceDataLine.write(bufferBytes, 0, readBytes); + } + sourceDataLine.drain(); + sourceDataLine.close(); + audioStream.close(); + + System.out.println("Playback has been finished."); + + } catch (UnsupportedAudioFileException | LineUnavailableException | IOException ex) { + System.out.println("Error occured during playback process:" + ex.getMessage()); + } + } + + public static void main(String[] args) { + String audioFilePath = "AudioFileWithWavFormat.wav"; + + // Clip can not play mpeg/mp3 format audio. We'll get exception if we run with below commented mp3 and mpeg format audio. + // String audioFilePath = "AudioFileWithMpegFormat.mpeg"; + // String audioFilePath = "AudioFileWithMp3Format.mp3"; + + SoundPlayerUsingSourceDataLine player = new SoundPlayerUsingSourceDataLine(); + player.play(audioFilePath); + } + +} diff --git a/javax-sound/src/main/resources/AudioFileWithMp3Format.mp3 b/javax-sound/src/main/resources/AudioFileWithMp3Format.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..53dbb249fa1585a53eaffc1fadba43dc91a64dec GIT binary patch literal 37450 zcmbrmcV81v)c?Jy1PBnSp$MTD5kiw9O6a|J1WjlHA{_)#N$6dQKxj&nj&u}6B{Zqh zQ52LeU9h4kx#4?V*Y643^Uu!g?7nv1dp2ig&Sxh2T5?d}B!L;M?Ck7LGAsZ9xk>Qy z4Y=kUK=5$|jOEoa!2i}UpVoQ$oYaN51q6Ef`T*GftHPXAx%l4nBLsOmd%OM5y@CJT zeA7=})-%xe=Koz8adM@nRj`kxv6%*d!TxXhpNx_`_J1;RN{aul>f{PJ8LXW0|2y&j zGXq#zT56w=GMzNUh!Enga6w8&K}rTIdvfmo67>kz^?&*QchvWB_dO|`+y^uQK)M_N zrJ+SKGP81^xp^^y!eSEVrDYWql~vU=v~={1Ow258>>Zr&E^gPoZu!r|KQN*_|){<_X{7FRzGiT?;U*qad>om`tXxR zx|}vr?zHfKN$CGF>2j zR4GFYXNlgB8x-Rh?!|W5bgRzHhCF3inRV{Gl$STZD$Bhn-zieTdYfx7qVO;$de8$o zdLZQA>xz;B_{{(Zn*brnlCUCmjr2XVwF@7 zWH1-{0%LI{8bk+iXQeIaU7k4$^r7HJ2(OOyc<(tLkH-#+4)8^rX6L&%?p+N0-B@_r zomVQvc%Z4zy_!!8{|D6%?h?S`MPIY=HxUl0p9Qti*9Ahr&NvPJB&n|VAzQPdQ&lH0*1vY?U28``+7{ef8;hd(TDU zolVva8UR8=WQ9iU1BFJXKyZj5K9I*WSa|SOstarn)A0|b_Zk>@QvjYGBOZ?V6(BVb zHc{~!OPJ0gdk}rOq_obRWRC(IGFy*=VR+QqHd0haIKvU%?9LA*4oqn(OVzwjz4puY z$~OV8;C7ovnJ5eZ1kbi#88ywvwkhQ@GH%jI2*f-Wqs?#|%)P+7j)xG8%6HI+)8zyi23 zyecG?x9Ew_9uj^EL=$BgPvDUDhf$Ikmt%Izp2^pUS@SjDsAWiNll5!qxexJ4prh+o zV(H^i}1{PehOET)(0&nwk>tGV4z+>mP*A^h@K%T4wcn!&f~pfh1-t!MctrM z{}kYhAW`a41U;ek?{s#AJtsIxpweG9M!oqS6wB=rt|Y-qE=~g$DHbCIV!hC7F^WN1}=3 zt|GJ%9WC&`76R@*_L@8uCd0-rI--xMu0IN7cuRbCPfdhC4yd!LF1p>8? zGIJ$k0ZuG;77jtzg+{>Po-27;CF1s6;D(OdT|5|O zkY&%Dq+Mio;uCL)L1=HdWUilyk4i$6>NAFv`_Gxj{`^&^o3hEMmgbkF! zLN@}?Fl1h2Bp^qo3ymu2CQ%(ji*{lP+O|#;%mz~X{F{z+ZUPzC5^g?uiELksDl9nn z6chi=^IO^G<13s~Od@seOXt{bXm4K`hqQQ3eh{w)8FT?26gLdz-N(k-e%b&14dHVn zeAZ}5S`2HWJDi+WAI!RX%{PV&=Rf%s^c>VKtvQOjG~k~!a#mKyB7}O?1je+Tk3t^m z5z5C$+Z%c9b8nFzZu(o_uJO{7O3gLSb|%bLhpO-R$?x%l9YFvI4MKy#b1@CRfaZLc z9dTDXFtFl{v@&LzKZGkpto~hOLjB30SGWMF^{)RLf&k8^ zyUmlQP$xuB$=w9#NAfRwvzF*HLiOy5kYcONB6{TWm1*108BT$?qYN1r(GAWr0_vHF zr*|zLtEz_U^iwEIaj*| z#1gw^mY-(@`Z=+(c?07EH;n}7%Vz!ojk*VDjGjdiR93UZsclc9MX{=S+p31Mq-}M? zDJQmj@ep6VaW^P}TDtwVslMakZp0snt{cZUaR3ne8Z3jr2T+80owy}Zpx3}6j9DX# zk)p_=FY~GX=psszn~F((d>~tl6pVRuPVVhjv5#u_9G1>( zy1qO*qBCH^0Zl%ONPUP*&VY}-Q5kvfk<5~SYzHPzfs}{_L|<)Vx24~5i9#t0tK)D@ zSunzIoB<*~G&Mm0oY@@`k~SUt6ry+ zbAdrb0S$pNziFs70FBg*tn}W%OrM*T^L{G%EV9Y^nrFynYVR?moV2+iLBi@HlMb>SUu#PwHdE#KC`6zxY_ zGJs@X@Rxn(Fu--arO-0l@_+I)YD{oy+Z|Jz`t<1X6F`wp*6^geRja3#5#@1dWZ78e z?14eDb)tP`r8~Mfl5pSSZf-AO7&pscM?zpR&Gd(kU;V{O2lL*ET$sUxS*-i)eQ37G zyME>4_Vu44U;ac;Yp6TNDaSE0Qdv=?##126C<7%^j`QJo(xrrwzDFLY#AIIik%g>e z$*_?l(PX5UaV=l+ghph+Lf(0zqv2$1f1+`~xS)~9wrMtQ*50To&uh1Gc`@>SY2}wM z+1Fk>{hXrS`f>iljqkHvpqMU%igU46L`J`J*F(R9d!d8TzMShJGciyuzl8Wk4M$bV zVu?i+R7wEH7IAfVrzy8eJ;}eEb4ql2o2)2 z_bsD(S%&X;(^?6J4rSwW^cs1x0^+p~O; zXZsi-qd9?*5bO2P3}}0~+jFb_GlB5Q?PW)V&fcp}{~p$Gf7$bl$EBHZ$_lqDeYhiY zfJS~w)tnvmO+w}%h>^5J9DiI9U`NLVHB$EIf5Z%Y73)VE?gy^}upB!xPQ!Tae+fAM$DtzRe}aJl!VoD+Wm zj|Fr@FdZ&`#M~3zJqYiOdvF#>BBww;QG?&LS&-pHAoKVVjgEZ)x`ZYuA>ii4$u4#X zw-AV#l0D!|CALSFz>BabAQsjIiZaoKxN{sXGMaVxz|jboB0Hey7(*Er8ip=LFS$hK zFpf7z7)|!|>VF;5+GLlZ8Xxh~y#y=5-Tuf7AIFc;lM@f{ z?C7F$d@Dw*Zh1qxk2RG&mVAqv3xcv>NN0FDt(x50%`s zqxjiIl@q+~@P3z+`^V|9S0>`*e^X^*fGgtxxH>NDjr-59=3{EqKC6}pQHtQI!(!pI z^7%3v5Xp?479>O3cShfeYmYymlHC)@?T@-7~ab^s>?v2=hhQ97`H4^{<;rZYoe$q1>nV4W6 zCnL{2#nc{ecb$9+=L&fC-F5*k4>cb1NCM9B%e-$EY3(88>U{&JEM(dPcGbfBrbhhZ+OC-byE zQ^uE7KxTkcv3~!XG5JxaY?qE|S^xwfIkYHN?8&{FLcLBJ40^q*I1_h+se%A+0kt_Cl=>2FUA-nMz1!hM7L-n6nb&~9@=kl(=7l91f z^ba~sFQ@7Q#o6pp#W$%#&UhUafb6A`?>)$=ap`ObiCYcLX}X@5%uVKn@t`8-aG;8= zB#?9F-S=XcN!A%=XbLh4RGcCAS+lplY;#PM{*%0b1pwJI)SEf+rBtf15CFpaVVObu z2stz#eJ-g;C6A72DXZ%Vd6a`QMNB0Pf|#^4Lh@L7DtEKN4_hqjo)=fUlYyI&dNCsi z@PC8T0LYLkfy2~aR9~0A6tp0WexkP^G1Gr3-?~W7W#cGf!`y=r3V0yNP|#rVKor{K zOk*AH4EZ2xlaziQofGLFh2qKWR-)VKg^r*K-r)6~a!=yBx9LM$<0ice4Pt}6F;16Fq>-OZnx1|VYA{*emCEzt)v1N< zK@8aJIZQppD5lA!w7a?Dzlu(M3xfTu(9M1n0Ps(7B?0|{lB~KwtdMs`^eCgT+*bTz zW$CBU5%L{)44@HZ7#XeJ>a2%bo+A!Y(o27j$m*SgwB-rUNtRe+XMQT6C%h*TUM*$y zY%;@DSlkmg%k%Cw!s2NeUYSIbwdIqq(zXn}%}V?>Ib?`k;ddMxB{RyQZh1;Oj8T6d z7qLq%oo^iQn%O&U@UTyV2~`LYY1Rm?qb(ake!n0)kUMpCZZi=+LvE~-F{eNYM0&In z+Ij;3d!xl}DW`#*ARfvh8M-$+*6C)=I(A|%`fbJquQz;j3fbj)8nEYNH59ZPAY^>K z|Rhu(84DiqeeiKPw1}%e0Mv{e(aO=&agPHu$A}o27OZ zC|7u^bWv_Z#iMKsSI*2uM~9kQ{U6MKHD(E?2L(J`upSiuk(x+Qvi;Nmz6t;X^w!JQ z8Pv#UH~Svv4XX0UmgV)r$rvd#qbMkTHVT^KSj(7IiIkmk+I*EYrK)}kbdyNu{m9lS zi>PeEygoW#b}+a~=A?^L=Sf%J(Y(9w=J-dYzoa3@QK5xZv*;!eKj6zF!xGDMQHYMe z+@3!Ubxq_rtlTVV9T6{BjM#TA81pCs|JaBIw|p70`p)W{-EHA2&QCJwWt^&t*!tvA z|Fup&z1!JRh=t>j8H*T27|jF`70P*+HmnP{%c)w*yp;LUKgIlSN<{ z)@=JeU8^eFbJ5Qg&f0Ns`3gVZb?W+tp39&UHs?;UZ`+3ODYWew^8o;gqZ;3Z#%4pJ zKxqwFca)~Vx0~4O*k%l#A1eX{ffzBk{r*Icdk;KQWPi88ScKwA1opk-`vNdxvKGIt z%=*4ya>}rD!q=WK`GV*!OH4c?uK@F>nnR^8PJI(Mc5? z+(Z7>wfsx9HNw=odcOrUQ*0N7d0yPqu9OVdV|(~T(5d4`UtYmzXafx*+Ov$c*!J$u zO3;Fs7a9PCM4Lqm%M_H!sJ1IkXJBV3DxNQuYH`@QSupxvM5+dHkkw5XZW>^HYA{rq}V@asPQc>W?TurU~1qo+EVD(tlKjGgbW2XY=+~ z#oz97Cwq=J#X2Q(aIKJ@3UHKR9b48VQN_$54E)#VnNNYzqYRL~yrzVB%6Wzr{oSJd zu+E_O4yWQUG*0n!vd# zXlDJbYXz_-+_Cf4VZRr-6`7#gmCqBx&67}(CG0oJ0Qi5Ctj(O7O!xY6#mvlY{>!^X zxW-jMsM(u6tdLl#DKLk9${QsT`ACKp8VE_#mz!x;IRm3d>v`6D6gIw77rfvQG}OPT zTlxfJm1bA>HjKYwUB=eVz~@@|)7B|BRvBLIka#e_ zzMHdv>-9q~@Jkmq33o~Hk-MItC{UkXwh>GDx>*Y$%DD^LMW=!QogcpRK+ObbBG%jGPz6Ih)pRsLjddCvX;x zz%a5T%O`iR-q=l#xxg_}D*2-Ofl;4e=B?H9iHf)PlpT6(TVY)*vRi2BJ}rD?1h!f z=ci?TXykasFE{$z21?M-#pZ?TsW(Orp$AwLHB-)4$o<-arl@&Y%+AUEI-fn+ckyAB zca<8I`i~ut9DrJ>4jYcXA@&Xw%u(b&D#S0)h)wL{u?;e5x*hQpv_Ek+=9^8$@7Y!D zqZnZyfZLiD{Y(NagQoXUwVw6Fa1sK@E0 z_#&f0jnezfMi;=(CeTL4_R$XpXW&TnC_f5{jra`t*V6SJK>VNq!)P>N#FtY%O&si= z<3o9C46843WKCKGEEIfCpTm4ssd|&eQ0wt(YHI3%6S!(#f5j7v<5Yo1_Ak(pheO?# zJu}gkXxZwp0g!tDXNpL2nHW1L7CEAGAI8Vs{eAsIBGJkIoYYfDFQ2Cn>|2OH{;{2e zdEEU*1qQvo@7#vw>OcN{u}*38-*kJT`eVxT6le@$fUsnf3U^jVCzOz$?C4da-brOo z$r2V3U~n>sZv=y;G3oiG&w9~;HHSXXYbcX;$PDBRrqKah7;$pQ7=HoX%8rM_j_D;v z_rj1dNfJA(?jH)BU%#sh@9$2smKS{z=<(OiS&SNyc;&#N>L8xj?e<>&6lf_*zrm30{4Whs04;$s=3zG3)uq*ZB|1Fz z8684KF(Q_MDVC3w2g@`cOzp@P->p)*H>H>z`0C}YywBU4pE|}@+OMCurf`jN$45Y3dNAA(gjD`YxDKQcZ}%%VcYLivug z?4uI4>h7})EF}RoUai;7D#FiMu220q1=@-lxns=87#u zklL(e#4&NP^wI}?M$x~k>DdKg7rNfP0%tV+zIlH+|IN|0FHkVZ3(p0P1#klRR34q@ z{9AZ0jeg&57B5>uwgQ}w5ka&4td=d7_ML1ojN2^Zxh{zUxIJPSg59<0k^l=s%njJF zqr3*bzXC;l=lwTqa(8-y(V40ySFqV3S zk7lI|I#ytM56&*5?0(FbUO{<5BNaOsrZ>i=M-HTCq`~ebJ_Lp(LC~F^vv~8eBq2bf zOrQvDR_&LrpeuK7%22~LSV1rE9(E|sX(qZ0Qv{Doh@o8Jo;8_E>P+ShN=ta0AWRmj zYEQ(N#{k~*8Yu|xG3^n@(1DkfuU^iw@Vsu#RJw+~w^nor_Nd*-mct>arnG`{{F~ir zUdQlx`XH;0GZM5XFP$5G`9HVa5@}%Pui~@Omy1t(T(yU3R8H^^I-AhUpY_|0?|vk< z7{tj$Ck9ZDVIr7A|NS~K}G^E94>~5`^eaBm`x4j>E%h^XVJEl+Dx&0ZY2|fyh*^IMSvm% zeqB?9TWo|N@zQ->^SkTL86AkAGhqa-1Hl;KYoTyD9NU#l0MCPEq2*sB2mx+3(y%o@ zDG#CWuQt2+R;j;Kj{Y2eqDrBr5RX3%jtO_1Oaf@3kunWL06-c*Q~P&%y$R#}2hT+O z$An3bNaSeIQ=l%0A=V#l>QAF?k6fXx_hwco^OiBvlHJ*s4H|>SYV-(jrqIXw6pJ{g zV8j4E^)Px2LqRlz38F{3>?7F(=z!w87G0arpfkfe-x=n*dMS%CWJd^zKw#P{m)Al{ zfH=%HAqWuB4D|1>JKWpAB{`Dy5w*yK=W-zR7WFM}Yy{Qeq^Zy)MQ;6*BLp^DDreRV z?{{HcI6z;<=gqq1N#bk^1vu!q;yjTeQXK1&@WrJQ5sfh_nzAKwCQU7lZQJGJ81*Siuv z9IX(H8xOBx)@0ehZYodnUf*X=^f8ayta!@#_Qy;GY7`kAM}uMGXuJ@e$}7>J|BAZX zBX_U+F*boM%^pAS!MV=fd70HDtPzx6Ko#3~UR=C; zKg9iRV3xUc#}$*#;RX9EL$qq;l?DsQU`@dp*onN+)iotHsGa&Zt;cdwA1| zGJ)*84s9`C!hS7JN`d7xPFTqFx9n<3Xu`}YcijaI@fvAFKDfepq0819^8?saQw*g;q*^&g^{U` z3N!%V!Hk9xnTh+#u*e52BE&TYg>s}N^J7V6heZp$#mX!tG~$(b8J(-%1Cb(0JDDCD zhWF8fZa#JP?8se6qtw$ue=`5vMAB4}*m{i3hz-sU-NnJdf%blQ$6_wNGS)ynuPJ_z z{A>n&2$~?`g~00eagju8bzQ*9gGoSQU`uHDoTh-L%h5R&rH>V8h4I2W7hLN88~PMR z8Sq$3-uwmC*Gv^km~Z5~wzWDIWKwrYTLq2-K>x5bAVDa=CmYSI2_tmMRIvrxLmaWU z1LU$CFTG<5{oA_;;-epB5i4ZA&Y>~javtuBX3Uej&3V^D_#?4gySnDL zf*ZS(qyQ7~$yfkGMRIEbal=u-#)cab(Ddg zFUHjS`k+S2s__`M>W@Dn+5K{Xj>mR^^A0bZmDGSg;96UX$$DT(R%aI6+=$tgvDb1f zRooJv7O2hevY-wg)K$H?(Y}(+-Tvbiwvj-@TU6@^X2iLRyYo`YTZLn@wOrwcIkGAiCK{XCw zv3OAl0B_TlX`$PyNc1<+$~~{BrZbzlWH-hVBv+76%6NiW&pFXK*FNlEpU!B55`o*aVEvuN85aEi-ghYSkp$) zEiUCo;lxy(ZF37Ygh2^9J<9CX#b&OG9~z<~cX1iyoe>-7S=;Ror$D_B14$RO$&r@6 zH0_H1Cy#_T1B$547qNE!AEOEPaOE}F2QJ4F?r)tNoa1?P@WnbFhU?0XfwjOy6gxZm zyo@1=E6+R?ohybJ2oFHfDS6X2NIX!s@ybq>+FH9m-~Q5e6sA>oi@HUnUi%Y%elv{& zm5yJ=eq{)JwK|G@W^3uwjF1I!$uX?bUslRIQo8W#0EM10Pp8SnPy8$p3r&`UmP|eG zCk@$Zo~NsQB_m4Oy!ol}fi$;D3B5_PZRvup*V3P$z1IRSuC;cY0!;x1syB3NU&#B* zCZFg-$OC~6M!je&vfzEt*t0gWkj(GQMs2inrh3xk0uKz6d^l5XQJf6a< zUBBsHud?4Od$2g^!U0J^oE3K|X0Q6ys#mxit>8U7d(`GtzIY0>6lH)m=Q0fxqIlAk z#MFDEGVeN500yWfJt=JCDz+wQp+6)T!Hs8|2-CFPsvLSOz`v zMm;HE0B_=Xk*pxAQ9o8AhIGGvq~1v9XhF{a+K35g==uv9q3?3+Vgnm7;_$8@9nu{h zI=NlHX&t&a=b6{}`VW2(uM7T=?2{>b_BoYB)#~dz-Qj?9tKTob$}@S9e|7ka&T-Zr z0K=JOvW}O@G{afx5nb(8m6N zkNXRtv9 z(kL=n{&(467Z6FxV!|)Eq#a-7wE+{8jN?z-6#hI|RSo^~(S>vREbAq~UiKe)(BCf_ zx6&MZnAp+%`16X;*OZ8xYIA=y0l-e!nqq#ZKONoe{JqC*{;;TQ`L*O+qY|aWv5Vy0 zgLy!~$nyZ1p!=G~QJ&~@9U;hq`AFFv}`b{if-xp)!I^#0O< zp>~lMMMd!qD2?B<)Mn}qm1;}58OT zC6*DvYF5ZfBZnt;mx5yCF+m+zyudC4v+(|;l|kW9h!9gDdH%|@$l02Lwi$KMxtk*X zj8|amBO(<^<F4PL^`C5@?>KAJnzz?Fe*`0q zm>Hu*IVm}WNKwu=qH}S1Qk*@t%o%_;`b-olC-kh@G!GYwZQUvOjI-fHI)7qTmBjUq zYZtlF^{#zxV-5KC?^nn;yVn&Sx2@5XJeFTvhz^oCK#;1r;86T# z)Ea-~^zURNzI5Oetv%sAKH=~ zA6u?u7vt1z6jjvJ;x=o=?%l*w11&&?*sgGxEQy085|%0RkJ0T)^>#xRFCVq1AoyUU zC|2#}Ip-Dj$f-L@4LM&Wlbv*F+pZ0~lr|iK>g~u<8(3)r*Yb~XSm)h_A9_#Gj*{1tT_rb#oRk%bB1RE1#6betE%U+H%zv6 z<&_s@KK_(_w&rcXYAo)w*V1_kvQe+=On+Ll;J&M(?w0+Snx!o$-bO}a_0ja(wjSTx>hBSHJqvn^C$&+uj z{?LxrA%?Y6a5}Vv&&M>()m~)~Zsv?+v8MWxS~he?%Y>GPf5$&dqq#3@fdXT73%33< zQv2kp?3&u=eCEYq7RtX5yn3fV%TYs%hA74(E%o>W0_BryeDFXGehQ520iV^4c3X-p z?sN&O&hY8e7mRnEc10}pSEHTy?5? zIp|KbFwJo}lwSca((Ck`0}#SVZ(%6*w9cT18)z7CAn!`QBAfi}3Iik=y5gz6 za*^0bct`OvMUe>5UMOu9e+_85eNX_x7B0@8==cM*(@bZSq%v;_v0HlMBbh_=_OdV< z{~D04D`OCR!D_kpLaZIJAUH8J8wLa6lDk*ZKDI~q9W*RMo()=iZyFRFkBVB|(8=ur zvnGh;;9R#u?w;cs*^U$j*_=V~$~yk(7QJa{aWDCHi9PkEKrE6| z#j2#QV$%gCWPHgd{uJmWiiNdgWc(tc?i624N!>st<*TwmAq;xWu7n;MwkU7fC}#60 zKpFA`7h1GyvYLXSO~IP6w9iRx&+()fx8e;p~Sn+C!=#WSqIZy9#ZG70e96% zr(y@62v|na(J&z2^cN^nA~oC;Yb?#?o@UE9RTtk%DsSobPQ9}@C43?fVZ}LYqBO-95KjueAfBJFLM8LOqSAOYfL{0gaSk&t>ry|cvgwLgDb zEUBBHUBrGlB$Go7f2F*4wq&OyWfJd|Di%1`!<8#08vf)4jn%jc9p)kf_ZhOd`2l}v z$yy9Cp4m7)t-pkH5e(l7Eh?yHZkc}74udj^ZDbH8@Ob|YZ>2K-fY=*iW&UyKfPQNN zn0e!dl@yjNc~r;PvZ#uA5ubFr&*DK=kGDlpHG9~+R z-mEYDCHrmu2WSMRj%3`714YFX)KgbcmlAG#&gv0{$p~qhT~-GBwd&73dn76E-Ie<| zsUL*pohtYlg@=*T*36PAWV$7b#&KjBl7cQh7xgY$JXW>(<8+pJkj3x{bJE<09{Q$( z*ew?8jfv$pkEvHqYTqCJwAYXYu|lC7UYDo*iW5ez6{wDKXH-K9qu^ltvlN`UdL&pd zlBBDNEYrJXDKF9xBwg!9u=g4yaea?}iYakswbz`a=UzXq;g}J~3aR>Wwaw%91}q~BqZEV)S)L0o2#U{kXJFt$cSZ({^E!fh@P!q;PtYi!7xb3Ri$q~(fmS>aDha!60 z)6!WCs^0Ij!3>Q}eOfTC@=xCM)zqOX|2*bs)7l&PG__GZkfq`Idm_L-I7o&=EB$tm zEsx}52~H_4{<~gSKb~icAkTFO>}0{huzSk@5Bmi#JZGFrLnw@`KqE~KUXx4 zem+Q|_iEwMjPgJd|A!y9R3X>@jop6rHRAAM$C2y5$GbT#^_W*5>|Y?m)_dmUsreez zh5wfNY(hp5_9%v5LL@>$F=bvDO`=f7t6~jwJ_Y4UrsDlLp9hIZR1>qxxdC+IeJxjX zJ*Y8-n?bWC&(bKzi!?NO(9Q||x~|66bXIA#Ua=}@YxC0|`iJJy!Iz?s;78B)YIQCA z87}>Ob?MW+(9fe@5{zIo4Ltd!M{c~{1@bf>Sq*_k2^J_k6wD>Y1)wCpz`1D~B(H`k z(-E3^XJ;Kcp4@6>wthdb>!R4O6w!7`axX8O^asq%U&Q;XV%K<}Jp0wPAUo{jnIG@J z+x?H18^&uR8QsJvcT4!y7uYtMsnn)D;jri~{vOEhsJJ*u1g}HKjb+a>j@VfH{UzqW zD@7Y;D=r3(uX)Tfo(SK@D!KV*jM~2^jEZ~?`||R^>-DBO?^0P!#ZTY9TW0=aP#em2 zH>n8Ey18yF&T0Ss{=vt+*4w3qb${jarO^ z=ESWltT}xG0quA1x%qk}MO;6&`W6&9*&E*R-L_y$lDFmXeT?z(hvRwAy!9Jj!l~*- z-%f$HPo_iKbc_VC!8-_k&`2()*4amrH6M?v>EJJmz@AO{K#zawFp%l_E@(ZK<=N{q z$Y>8guM3s*OX$+__)g}kdu##;$Whf?wXX_|w5TH&Pr>frHT#*{Yo%_e`TDW@Yjonp z5B(GFAFe%fu6sEhAXj--n%sm>+o-DEX?$xGwBmM3{xixth53ezR- zdUG*oDE1dKl!y?((fIIEV{U6b!s%KbHpKjU0lVxzqW)$`M7x8XK$5aTdqyVp zn!@2-7e)8K!E7!+zkL2mNBTT)Jo?ml@W`@^<;!zxTZ#BCTu%jTAd^OCR1W>&n+Yb6 z1KS%LXVYRm6Ew>1kKVn)JClKAq(;Ap4Nwau>pWt z!$#T9wotxcuz+kr_Nsn_Z0?z=MTz-}I)EQ4GkqCSy!^MnIOEUGyLsr9HP= z!UJ9AzkIGp zQE%@=jo5w!9Ve*7ijQoS>?fBCZ5b%Ci8bSnxsp-5FQD>O$I6#aek*0%1lbHXu$JFy zxMY;k(~>p%RX~o>Rrk)ilZwauShi(knq^G$&0XblWtoX;!-I5agodL&bN>oH#M57Gygh&H%fo^$D3-r`@~*x zdNZHArs1WKJ(7ZX!;(C%HSlZfpV7%ih(uz^pwH{2=Xm)us5cl|2G&PCUZPj)j&NZn z-LF3HPkvx949trT}{Jz4=(=|E=G1?y%}tU?Lv%j8Rj4gIoPG4Xvdwgy_S zt%v{o(Gz*>_MDEXNX3)!yQ4DGkC4WxcCyB|b*(FcFE+V9s|$15FXfB-?cHWBcys3S zgrs9&57QQtto#Lv81@qA);)jP)Bw*zUib83RJuJxAh|0OTxcwaaZ7rJ0TQk!!9tJv${H!3kbn`;99DDJSX7kd96^&Q943-<@}Z$xXj!F={@F}j#*{VvbQb+qLIK4p-Qhv!Z$FWdg&r*X zt>FCUpZu=>bj5$nE!vBWdLUPCzI8*Z?NOG1M5;rvRLcZw|26ZW9Lz?dfS1vA}#gws6-BV%Z3B zZgBGp--fw|1+|^u&Noc|=@$zHDx2Kt4d$0DIvEche1nxK(fRS64FI>WG$CWPF9teSno>WL3v%4VF}*{YW-X zPFNhV+7e%_I3IgY)5=il*VY?H1F@+=xCi% z&i@q2ZODj|I+PKAoz_vb81xWX+!#Th`QA0I&4&5CU)2|Jx9^4sF2OigZ;wd@G`94$ z5K&Nh-gA$>;o`G|yVZYt*HfCmTR!t)Qo7%s5kXpiGk@umOeS~1Zw~@ekJ(HhqI|hD7H_oIdqV z*FN?=vOuT4@J_dGrru>#|8n)ZKSOeye1&grLCXaL&%2@0*j9a`!bw9amzj5)`&_o> zUh(tOPi`49!mkf!@N=ao$MCDyVkw=UYfLW;-M*QXEpmL9`Aqsla%ewWLLYCab9uN} z#e0i|6E%yh@x0+~^rjo9gniv%+du(&7FKw!zN$*MvYJqy>gA<7@isUx*4yZbg-?!v zYO+f*`=E|8Z&qE!(Hj6afME1ilSH83qF0Uv4KtFi$u~f(LowDyuNh3(s~)fuQuDl5z5mvnfuw< znFj&sbT^Sau~#HKAsY``OK_saX_O)Z%cXH@8H=9NI@|KA-+D!Ia!IO(tH_xFb9CAV zC1y4{WhVaW7U)&msMgTlrmg$e>f<^!m#*0Ky>ZH3*D3gxWAt|mEWKPj_GvY{P)=aeg6B_yqq0ojc&27@zxG-|n9AwQln={Sc+&sj__Q zTv#sc#(#SXPrO|4B?NNEm2$JPh*XOlw}(ie#iu_cAO&iZx|z6ReBh>5-8m@73kt9w zBMC8rF#UKAgbSyenLFbe2X}%e6r$k!@9E?(t)dj;D0rFprh5q+DIug6ry077+ltYV zv_|fIc-E>DX{J8Hop_z`85Ee)07FKs^oH~pxE>5@ThskEwF55*Dc_JC2E$-B`Vtb| zWPc5_!M(%2Z8IYqCo5#h%myq_K2Ac`O@?x(1L^C5tVM`fI+R3hX1PLW(M5uh@ zDXHOnTgzAX9swum3?Od&?(o3gaiN9M@#I`N^sKq+%^8AM8qunke*JeVuDDAdfubzN zC5op%>T@sF&ebZ>lD6}RN#g#-6K9l$Vh2@Uc=&=aC{2wRQAJ}LJbH*O3K>Qww0bSY z#N1Mg6TzU})FEKOFvVSlX;M?|q^z%2!}5>7nLS;_KKPPpFIyY2&~@@Z3uswBbl&B{ zkW-+oNVSZbFOyr=(f>}S#t0Evk>pBWvE&)dK{$0e4mC<_+uOQ64!guUO#h-G31RKp(OE7Hk1<<{>JdoT9UsM?13MKr8?S44gHK zNl{S$5o*tF9H$-&m(o5?7^ugzeV`YXc1w&w0stfmz!y!t+tvZ)BpJj?+7=~d;D1pB z9vvf-Ol14!#;m!_WM4RPnl%>wtO}^@d^L_u?!rJ@9<8P2M=&~|(Zk;R_aD-nvY{UV z$T1nEF$N@&TFSj{$YRnWJ?aGmws063vfj(O9cPhKAG~@(<%KNbH+q^|C{a{Z_`(qE=9AkQ}_B4KADhq2(F7Q-F3QHW*)I zJkIYlK)bzfqHZkz$jN^AZf?EF#Q?v9cFVKlc$66iPjy@W_~7ucvdn}Hl};paZ6Y^_ zkp`GeUC%0Sel=Nm5sc^{E9>tG761z&(uZpkfjI5}-OnUra9nZ{z$>t+qN?ZJEr+Hx z((xec(d8hyZi98;+!3IsRD#(Ri8G--j9e(1(H#MKpdu+BhHOtfDPVK|{o&!?hItHB z6hNy1#dG$W1QMRG2@KeIQ;wOG#)bwO4j3A<6Vn5UoUTgc25`2B6}s9|r2A zt%*T$F&9lY{Vl|X(4GpkLgdRxm5j{a)L49xB449jCn1MkMteDN)?Dt+RmHGoa1kQ| z2B(t^?L`m&+&%)-O11p%!PFFz@G-aF_U~tZzZJ1zJ=b#cj{Uj5`(4Xd=5^lA;Wxl`+adsvP+^;^Xb)Ec`~|A+8`g`ku+Csh z=fdU8jQHiGDffMkRefxVh%#nPl*TouF^wV!R*xVrN%N9CYp2ax2hWAd#Ksi7gk6=Z z-ruoRB+c-hI0DoHvM{>A)aCY1B_^YdnYa4V&{V+QGCeTEB3Hph`Gm>qaS=8DgDN=p z6E+yi6LwFI93Q|Wt6857iUpM5U}#h*XpT2~LjY;CJ z<2x(H#Ewv6Xpu6)Zkho*Cf|R#J-Xxajz>He911%ApHx`?cptFT=o1 zX(s{K&=ghRaPJwT@avKw_JJ97+!Vr^#fSh8CcB26eu2amE9=<3rZglYi%(0;4>joc=atS#4v(hZKAE264cgHsh{oZw6+I+$cUo%)!j2?eO;Gi?U1IcA2^RPWp^?*+ETIa71cYk##dd2H?k>94^p6_x@ z57pU8p))=VBfW41uxI*coyN;3}PGl8z$G+z*9;8(&@Uhbtce zx&yKZx~+0)ec0UiwomG^BueohrSBoGSW@+Cj==D!bK2nHiP}rpRX$Ww|-OaU_>$^E^Q`_i}ULr}<=i~0OrYOWkO zM@!>P($~kIOILM7`OGRmLh%Gbb7(4xsZq6Kjj3tQD$fOo6FEH-KLu$Jb?7Z6 z7M2nPN@k%Zm)6r)PB&}$u1ylH$DUqCMhBm9Cs;hX8ZGL2VQVzC;R}x)0>hHW56ruN zvhZy@QaV5sZ7Qb7AyPb(r+Xq#S_DAN;s;2hB!C1K!C_nkyR4+%*)xzASmQ{iXe%D< zEk~=njN6^fYsW=5`QBX2HlF`z*3b$8hqt=#xJIC_hql{wb#)GWAeQ zx?Hf_uqpRi>VDZuo-6Na+?Hd3d2AAiR4%G_&$YB@gdHTRfl&puI$`RC?D=4+xpn;j z-*^4+Ku){L8;j)$XY-3WO+~zUPai0l9Zr4JS{>Cp{1bS0es^?xBUhm;hV2+MQfZQ) zkMsL^-sAXyn%kS@ohOIyjWZm%e7j8D^A~d0O>K+s}ph6iHT|{%pmTdt1cPd2dMCp|dygQAe;O z;e9<8Bl<^*#&yDZUkA<~d;8W#k~sYAEo1->^EJ|mtv#zjqXW8gO1Qdb+FLjk4@Zn* zi7HA}sXaq-in`(=&32xijv2t1wHTMMrz;s4+@#MIWr%a$brRFP+}Zoxw&_9g?&Uz| zPJuT!VV+WhEo^vMb$~|;?5&OJghaSBW&|6o9Uc>|c1FNbmVZ&^pTKK`NgTZ<@?)RG z!W4Mj(JKOg;H>+ES0Okd7z-zlb+jq|F*6QTLm5dtr21p z_vi{BaCJPyM)X52{(c9RHfsKcQQbK)wN;z1xwIpYnF^!Ld0!dyw zS<3i95Wn-`L0Ea+p!)9N)VIS!;}sx4O9(jG_y_r>lp`5&RwR|i7hj};kde_&Zq47~ zpyd=4n-@~@Bsp>&lbF6KH>4*bcW{h!_2vitH!@z23w z!^<5XvCDFdl}7rMS+7Ign_H7~YR4ceVmp@B?>af!=)*Vhv9(Hu(?3}kC5I}K#PzC# z(+zspDx6OF%_HN4mTE(z8=Gp*{hj~&ORszGFzfJVj+PPQ_`e8Mf-G#T5NED>;CN(?UwK>tfH>RTufMES4`&+oCJz6QRtSvApuSIepEHJrOxtFB!6UweNz{koMtHU% zHo_DW!-|1`FmM!1h*ZL@J5Rhh>1y)hRk*P>!uh25)|St-F-Q36&1huFgR6&4k;_hl zkDlgWCG$1n*Hsv!YL!$>C{W)5ukH{gBNzV!Pj&}i`q$-{TOVC}{*%E8K=ovF+%gtc zLjbXnV7ZERV2Ft?d%R}yDy=t&E1sPl@JeX!UKDJ8J8 zx^YLm@|6>9xT0FG@oJe>X{L5rVZm`WPVHxR!_UijF!zj=Tf^B~zo(f02+W_u!?G1_ zNfIIk#ysVGK*TUR7Yrt-^D-F4{0Gf}j(xfbWLzvco)H6={(L+7V!PBvM_Aoo zmzL9Cp8=f*-8K(JEO3v_92_~!0Kf{==O{3yfUEh&BDQ*5_BamFD8$0b1>#q_s`?n< zfhh{%XcnISX=u!x%`JZMiw|}EBIGyUS@g^Pux@BP<;JZnwhPs(Cq272`^X9eC}J=F*TCh^I_I9VEo0i<thQMk$Yf*dRgevlwgu>~>7_!Xcv*FXzqo1Y=Izm|iA9`` zo21l>TQW|CU+DPZbcGP|Zxmd_v?RHVwqi=~aGc&8&x35^$;2``BVux)XyBl)FQ@2* zFlxoRZ}d~4G9vGrFNcc@hc|TPgWD6qW-UdIw^g%6Pnwr(J-kf}`xK`?UDOm84t!lO z9O%3JhFKhk^F`?>4%aCPju-KT9U0dcSx~~=6d!UaFO(maVT=$3{V24HG!c=Zu*jbH zZhi2@KpU)DRAjm1vO7JLQJm_@Mc`EZ@I?0#!(!|f_BLt+

1$Z= z0QZ0(xOYdq6jc_QUZI@u?j0&V<+Yz}5=q2o8ZHyC?O6#C=S?IJA!ju@H|#~onMSOF zvOp2B3ccks6}5yySHmzyUODXfp%+zwlLX?R3Wgc*<}nvfcx)bL|FP#Yg|DUxRh08A z437Xc12{tlU76+sShMU(t1;-$ypt7UWH}MA+R52-Z6!1vTJwU!Lr2_n*l`JCj(m|w zFa7eY_4Zhemjh})zjX2pjZK3{MjXa(M1ZC2#5jyQ>t`WJB<7h52!w#DcT-)YfwFlh z9i9>ADZWo5Y^*{)cbZzGOuV%NDq!<>$i1;Vq`wOdH@_`CCA@QX)O$?*q~*f}0Et75 z0jSB9M=r!mF_dff-vaZe?)G9K@WxK_z2!qG+=W4Si8iyTdxLRqb$E)xF? zJUT%Z#01Qxm5bF_o{jNk)OLJWr{VD+#~*e#b8Rid#)0iyB;g1p1k=9>Pk7t+&ij%t zTY|omzmtFbZNA4r*RG{Z`U)B6(@7pSb|U;R`(nM7ZQxc{D{ zs@JNB{#p3@YxL@)!=Dpp`%h;f0l+2}u1&Ei*Kn2$ca_iVs%oCQ*jG*rnX8yAPJ#WH zpN*_UNi#1`UP+~;1c)$8m2F`+FX#bZ;+bd77psD!w7x8tH`#RuyjX1W&ijP=H5@E* z6roX&`R@c->#bovLtbg_{l?YXhgI?HxBw{IX8=kJqYW?wPUfiuf~i_rzSxTnR3xzt zGY6!C0M-~;76YO-1f&We%3y?mQMEC=n`OGdi8#T*a)P?84+yG5l(^W zxTQE^NQefIS*cYpGh&CGbe-E-KCjeBFd1^@#_!JcLy^H4me@&?x);$+ai!QB3 zzSKE5$!d*w(Vho*V1XoWuOK^9kq7glzU|Y;KVG`=bVhzzyces<*A)HH6l(%GIH-_6_>)v`p;~M^ zon_9cV-U_7>-Fk|6y0!UJ=)~&Cptki6%LEmV#zUTNVa}gBxdFFy3GK zdCGg(2AAmvEAvdL3uDp0Xn8*P?7Ai7g%!4+po0d)mw8ZpBl^2adJ=A{eR?OI)jYEC z2zymZ{8?=LnUxilCO`F}x}Dv*j4MjzUds;?fBIJ@Lyd#&_ zre?T`!JMEe&ZILiVq*pLbw-g9;X1S<;4COs1su<`Eh35l z`sfhiG>W*Af&q$b^G>%-%`Wr!p0F*kvF$yMGx&GkwM`uvGiMSS4ajB59^~bfp{wS( zssc|}h&z{sN3Z#W|40a(*t>M|LOgQk^^2j zJg=d^pJF4m$X4tY0Du5M*g?#J4)X!A!vryIAbOQmo(OAo+_09&1tDZIq%f}ogpgOH z9gCkG-D`lt@mlmT!8kzT;BR@taUh0HFd9PwiST+)#1x};e7MNA^m@lELYtlnS+t3@ zed>~RY5Su-PZisF*Q9Wv=wpwcJ}OXl`V4;Ft8ocKN8n#&`< zWkXfJHpa~b)lhx@@J<4aDsCe1yb?A7su%-*5yFhWiA&2twagL4jAAn;lWI(T)tX2IPVs9ru;r9Td4@Vlq znX2uQEDJPYUPb;UL|nY7gNUD~OU)*4q&>&RBPCnsr?~~rX)LnYsyq)qxxU6r@p<)~ z;41l0(Q9`QX zB=;B*e{wFCpTw*0(1T)267x|$)m}LLo!rz^Kb!kze@wo*bmqne4Kq@mX#S)u3QNH} z!<>`w@@nD3kZ?1%h*c^PEMD-puk|&gPEgeiRr&akauy*F?bNBGY}L1=k0R7YwXpG$yBy4(q|f7RzEAsv#GqL&)b}Sit+U4Qc?3sC zoNsYz98;c3{=Ja-NkJemj1zy8H<}<2r!~b0BbbZeUa#CBn6PQ}!K(?nKwbJ4*z}Js zi(0ZUhHEG?QL=HGtYM(sGwiOVuO^mqz6HKbIl~+9eb5&%MDxQ665sslvv8~z#CbsqZV-@Z-~Xn-{F*Rx#}Ow*y@*#Hn?;L zgHiBZ>#)7sat7&T?qWvU%9a4mo4y*YMHGGj`f}3&{Zp#o@&kC&MzGE$=2V!qV0&!SbDT49kpty z7tUYmulDvI?_!O@iAlgJ`^bb96ukR7j{H-#ssi&WP6n_5SWg2$P|&$ubiYHe%g~3* z0ets+=_C0~5EKf#a-Js8w(5>4nXHzH0&TO6j3onI&C6>_42`<%qi;|Dx*xMX;Cto^ zvDJU~hYOedg~Q)ATx|fz`8Hw1uRR^I0|6z(okXL}3qu9tjN;39Y=qlmo@y<3vzg^7 zTGYfCVzqx1qwWyDm3VVXe|`Db*O@ai(ETU2AmH@R+&h%gAGeKxz*FA=&?_QrY!}nP zjGq`7-#Z}->IYqc6;avx=W9zX;`$?+_4BNS7pJAjMbk^?l5 zDkkfh;_GA<|A4~A1Ms;Y^T7G$1yqKfMrf`M&zP_HqwP>{MZJr44K6=k9}ecuf4(nB443e z^^y_dUsIrP+9c^&>yC2hX3D1C&ui;O3KXWB3_y&9Y1{-85|n9XnQ@> zf8kWu-EUHNaq75CBRV9pZ`Pr2da)m07(S#pvV#y_w7N8PH|tfYtQ(uqg4jRVhu^w_=hy%$6~j9Hj^h9(x^s;=dP zsZ-MIQbo5wzip3wXQR{c4&0f!jR4$V1KWga^U3CS!d_e%Mhc;;aDQKy{sQe24)1cA zYyWEs6btZejlGC|hBn`(cvoI~fL`UXgH}TJ0D?@ki5ryxVPU*3I~=zZVu))QMcHT_EkR;SDqrW_;usUg_hvUq4x60;-D zk@n7qu3kauYef2c3ltOtgwlyZY!IU{?q4*+-o}Ym9-5NT*wC;lfuCiM0Y6AHfU|KE zZ1^xZo1SFMb-0-VhtmCT{^&kyO+_D{Vx*0+uXtX$uF#vgiiVtvJ8iC8p;!Oa&rd$P8IK-_SCCXt`S|^vDBb#h(JuUz`ovROXH|=8!-L zVk9R=iYBX&{C6m86}H(=gurk%OSeZGpIB@4Q)>*uqT43?;tn2gMRx^ih2oD?SubmGe!MMrRA=?U z34?G&RCTF&NH#qa}EGa>h~T+lh!Tz#y--5q-+I8;dS&xqy|8d0^rcRG^KR!vT`87Y!l++AM{glQ}O^E?!3w+NO@y*}_j= z^(1>Idy*f7KxUTR(jKn~fs}e#CJR*dVfH+*8I4mMAP@$JZ2``_kk(&T4KM?-u~-s< zP(3u$_)%W~#K2vo)r8_a($5ccxo&B`%w{6MIrjeZld8BGp>~N!x4r~NA4cD+eARy? zviT$c#NW$L*OihX_-QA?KfBwOp4^f<$|(*c>8^?F}eRE0ftIdv$P34S6uz_hYD;YO0G-b84UmjysM2F1zK*w14ScDjpZzI;hRI(3It_wQo-WuwaX_CD>G zS*`+Bm?Vx-EFGE;daC$b^>hM3g@^V|f*T@4o6kKn!YA3(nr-s0hNuJ^N0?$XjuFi9 z7SFVY_(}~~UeEz{ut9sloVd5sg2i3Men4r7@k5VUP4jzHCcxVYz~JhvaSqI`zhrQ>u;6D~ zbawu)(5umZlH96qNv!>>&UL(zs(=E=W8_o>1yecA2%2Ivgvi)sp))~3X?Fz)nJqk_ zfI&(=#=|+r3}k)@gF)3Giq-@{AUUDJt-E3trLi1yo+1BBxif%h5$pE~N$)abxVyG; z#E#uNi`NP~6PR9a03fot!IRh-#o@E}#HD-_2m)lYK4WVdF9XwqREhVa(R2qv{2NM% zq)q9J`1SHY!LKHvYwX7%>MAta$z`|4U7gaW9^5*NuD!B>s&DzvhsuJsIY z2;npaDqT9}j3TT`$9nwd>E0|0B>_DDGGqgQH;Kut@irCygu+8qd#R)xCNc7>9R^?4 z!x%n)-G{{1^;@QVn6~v8_i10nvn?= zRv4#Ypd@xHZ~ied&Y^cWfMC`u4d6IaToRk1jd)~4$h24r$vyuLin6+P@3bbXk5N3~ z=3S+i-8P)s-n?DbZyslODrQ(8+DAI}90s0yO+Es&3^Jee5>ei^G&e|Hvw9wsXp9Kr zieuOdkPUzG+MnR;b%+h~P{rumgIH}`RK$>L3LzK_3&0^e!AxJ5vU6&8bs=ow*+4yn z)86@Ai>&u}^=$I(vn{HTS*HpLrT^?5qi-!-Ov*05dyi=6xqE(6DOxN+7jVLud$?T| zbUVSlQr5r7QkyAZotTKp)Btn+)5z-$U2dm4YGyiMlg#vjGoEeVcKg^S-hKJ+n3 zF0z|*z9#>1F2oFMmU*F6mu&rE*&$T%WEvWl0GSKx;*95b z*}|ri7!ZV$;$zP`Emg{w+M9!$0pS)fnN~9!UfNo?=RGJ4{6`85K|&xx10Q}#2n>>)l^0i`2a3IT5J@{vaXx6q_Kzt)@JA@ zvu%GReLD!PHvO+b=mod9$5a~G;R;thPst2xnTDh7ri}2_G>_1l`!3%ywo-cXO<38F zdqD>xE%P8m&(M!~tg_i+NGjz@&!$3+0EZEJV?0plIv}i2!Sth7ukaz)x!4iqjjzh6 zKO%qkS^qp(_<8;J`J3%OuA^s>D0hK>%$QB;XrUzx%8U?&smpy6M52`rUa%LMXd%Q- z;+g|#EdIC`{-1FHTX`^PN{Jx%Z3&Lj69U8r__Z9v+lhvR0JfHsG;?wJDWf#nqWddO=4uv_TyaGv$YVmIT%%OESg!F02?~FK((-wy=OS z=b8vU3t`~}yW!;+r8+8*3*xtDn$c$>YkeXKD|RD-uVCp_{(WzrC;C~jwrhTTr(m9} z5~_v_KX%>j<8Dl{AtB8~@zLxtPjt$o1)k%LnSje)*U;~qC4e)&+@irRFV`SzC-IGt>#3K=XYf6;rWbMQYv9DP=B<EBoE} zff)Ek{dB4k@22^4u19>8F0@@*@s(G(x&f8NYZYf&FIsJUa^#m#+@=bO_sVCl<&&rG z_6=PAjf{2h-9e_({b#os{q^`r;sW~1)E!R6w7Q(PsVo57X;XDGOslkOM6?0utm>FH zx5S9;EcRtjmFwpq?EobMKEr=9R_4}+Xv)L$k;+Ip0<;H99I9630x}E>69~%15l*Q@n7&YJ?jqXo5Ce|wq4_}12L!DYT~^$mm1Q{b+%lwW-> z+L(4v1(E&46nKUpXY%Y(gqZFFdB!}@a3C-~shGT6wq<#zBhF#3nk5yleCNh&!@R+# zEF{UCX6HThGS;lfrbXv1}UHbh>JfE9!N8!8%pQik=3j^J=r`NmBwW}X?io9E^ z|GfQUF@3-i*Ss(RVCGg!P0%X+ZYO`QHTaKdhtbzJTWL#^4N zg?BopWzI#R$CD=8eBAgRqk}f>U=)-drJt08kx+D19kBvSiW+(JrryOHe^k^?8t{$F z%S)H=&f`$`?g|Wrzc7o)6&*ZnUqAjX@u|M$$ZOax8a;`Gp96yBZ^Xs*a9Buty;rGh z;v>cF;F_g9cBW^Cy5J?aP-}~4kYP^zvUIfq3G6d0; z)X&XiHdM<(`u26&1givQW!B(xGLyk+aJATaKLIJnIp z{c#PtfEf2by4)scRE_E25xUAWjgiEst|J-_-h2K%J$H?)DYEw9?vEUG?h^zt#UH!e63`_h+G5C?R;yOTd?x`V zfxG{ojv>(V#gopBDg!sW2fKBR%buFa_tP9obAXSWV_95UGr)~M+Ls2n@$fk)Bp^_B zh@h&bIQi=+Lc7$Fp(8+&}&S{phUGeWri++NQ2 z=R%iFgT=<_YYa0fyEH+MB6#sc4xteMuL5ZQ(5=BDL3u=;K>I3#*70h4VV3+)?e}aP z@s=zj-hHv01?*>|CmUfV{hxk(eRHejq|4_A_rhkA5f5M3k1hSVZnt3YxpV2}jxSG) zi_V=qnSUuq9aA)f@LY)>P8D7S_VSopZOcZ;A?<6`hsnSh8=JA2GN{oQ6eoq(8iV!n zUZ%_R!j*M(|1QuPSfg5QtTkj_Cuq}9u_6X3<^GhaDjRK->vk1@IQro(91krXdEh_Y zTJl#9VPDVBv|5t|i-__IvA7_k_&rt`#m}f`U?r$1iwS4DvI~*Rfo(ehC$)t`>GK_f$koX}u0J_#)e>`PrF)EVyDGU$oV(Z3$++(X0azKud-rH2`KgTd(Q(#<}# zQYg!}`D+(WpLnlm@BHgZ^M7A+GgeuA(XeAqBX4@pQaOg4Dk^;UDT0Zl*7#NH(5?7moMd|o7+RzE>!y!|?NlVoVE8N5MAd@G-POsH1 zUhOLUJ^x?!yT6Scy*H-2yU%xiK5>ux#Eu2%Pf}KwO}FpC&GEMZPZt^vSuaG@m29E- zCoTTh<;JAWilLl5K~7M`A26_zCHX!fkqu!ah%>*ys&RW8gr4|# zv4nKafyc+n@|xB5kWKQFjgDJ!RtnFE~;BtQn>fQXKej$xGG=(ck9~ zzJDXwYIkNKE^buoiq(F&--%J4{&!MA9~#dLAbCYkm5=%VD9rFQd2vP)S$1$f_@~?E z1KQ9LpndB24@WQ$w1sg_z8K$_+_qEC2e|z>AJ^`(0`B_*NL5qozthumY4*JI^E3PB z@r_X?Pyh3JklCNsqf~j{FH%*ic5QJ~MWtSJu4`D}iI%b1?91ld8Cj9d`I!Pk?QO#T zg${`c!sY=`@1@IsmDdg{U0=Yyfn% zRv8M+W}p8IL{L;!VVGh_#2ZRpc8-q*g}J)6v%Z?VVs;+y|4GH$=w{i;5VywyXtmYk z>eY~Sj!4y?UR*wWOwVyDF!egL2t{Y$SU~S>fxc8qKTCJjDLi}&0$E_CysfVj{NgFP#N16p|1xv1* z>WO-FaEyS38IGsFtJT~grK~flziTM|zrpY~mS4_k7)O3AUgcxxD|hI>%N5xu=0qdC z2G#UJtW}hSSfpHYT97{LZk^8H2w(m{% zKTpto3a6DO|2X(EzN4xLKfqm-N`a7ujr8Av`6DS81lR|ulz11;EbeTdw}qDug6C`R zTydM*zZ^9cK^7dH$TG0vx$FyxgTT>%$*9`aroXDCtZ12tW4S0TJ%@@xxXE{OT8}ghY42y zwE8>LG!92FcVie{Cri@2l*7}h?_-2YMArI@jy1Y!2G{oI3a}z{lcm3*e_Mk5RiM9- z=bnvJacuiFm0m1x-6Wa|6Ton9mK%x~pUrIb|8cIXSx={uBQXCiRzXNWJ|eHIpnYJB zA9gvd5^?_wop7QQ9hVCxY1rCQQD>1t4kpS*Uaj~wq+QK`p4m?S{dwI+-?Y{P)syWF zX!89F0eP8Id~Ndrucnba5?}bOuFq=OJVoX>K?edo_gUo=lRKLw4bNvOeiHui%>39< z32lQ$z55|n(t*rRlNOQhL)*R&J+(2CIi?hcvljcHU_c~F6%FtTv59hJO2OMa4U2sS zUsu0FQkO9n7aP$zuRfJ+o4oY^X_~T!!$XJszl|-&k=H#lssb!I;S7y|-{zT_W#_Y5 zi?SC(<4oA0A1gPXD!*{Q_i%mng5Mc+0E+dAHo-dG(@ufzfn$q5>ofBe*WMpU5vqHqMcqgC_OD#qaDIY!J*KDf&@w;dyK%Va z5ukO@NGKl!8st4pmLrnuXj8-5-_7!V>4XCKLHVi}^^?Ylu~H$oe}CKoTLKM=r&i5e z`by`97BM&zQ_pX*eDzPRLbVfWg#D9p$)lX(RJg_kQ7A&vqk3abOg)1q+~ z2WP!SmjRM7$j4Uo`7*lWsWtJDU2gBJ#o9lb9X`v*fBL3sJpB0*Z_MaTSFV%KQ|<5n zugQ(J8-lsleUt7omEe!LZMST?W5UjHrnVtTz8HCS0Yl~#J67~9;&B4!qe|K4^su^` z&Xnb}>bk1ubH*NGcPTq5b`>&HQ7>xkgXj2{3`VaF&yUqq1nqTPJ;}MA|GMUFD9gyz zWaG1cFU~Yxjauk_u%Yjq`zAt!(>Od@rrWp%utHLt6^tPSO#{txlPMYj7EI2k@Q9m( z&HPmH8<}nG?fHoyrw>Ij-&E|sp7efq=#%_qS^DwBeeZ{TKJTooo&P@IU8Q_ZmQPJN z0<=a+-p51ggS?Yy3Prst{y(BsJj_vxpeP@R{iq}3+-lyr9*$d>?!6}52_BO5r!5sE@eDk z{g#}!KC@1(RonY?c!<1(YyoTGTSx576QfXii#3qbk*`uf^L*GipRvSqRn{VLD2v&C z*|=lwX|pa}$<{(fqFL!PJCQ7C*$~EJf`O-A{C*Q$*<&BxOjYkdpNf|~(6x!+RpXLtYj`~LW>tNpp_?%aht|7wVZ zyV?~zj<9DKloYcTrIt=S{DpXax%;PI$KQRm!6ewjd4S|O3Q9Tu{wso3Z=Ffr>37xs zpWCJw@)_&+ws*3w$n!>lYMlycSDK$vks-^<*+hdB+k_L9Y^_RfcGp=CryQSi(Wg@?Ub)+G z+}n3}R;D?`9ugP(uIv;KL$FxtgewT9iSr{^%8MpTezG&`&?rcWCdDV8Al`7`xZC&C*7AqL~5^ z4>Ph8geRMu#hGQG1Ds;vwwOVYi&{ayb=|igeK;_U?w`Lr;uD@E^y5a?uVGeuQ{9S+ z`>1Yq*kUq7IK}p+hnHj}iO!Y~JHc--SZ=D`aM7OPUs>EZtq`3~PON!$r=~c%(w&m2 zi2Z2Dyqf0YZ(HEH2s_Mk1&+>}L}`U1FMhAcGz=e_emY>J(ze~b6B}~`Xbm*tC;)*b z1|%giw?3uZA*V5^BwTDrGD5rll*~_^03jO%Qq|{&o8<@%RCpjy5nAr+QZ3v($NcH9 zOv%0Q69{dg|KN9Z`DE-6)tQY+cE##tem;WdvcKf+8gLo=&xZPr6ytj(N9kgvm+~?y z0y#I22{i)|qQ|%{d#smvehPAFHrPgF>vM*Z8NXAG>)rz*%5rU|MvDqUF zbma5zza?D|PE3w1G&=Koh4>}1qqcb*09h1-&FgAx0}>=lmV|;a3?tN8i5aI%t*t}^ z|53hJOOKL*AiUfeU`^8J+Woa2AYY?f&}H2kW7&mR&l-rTTt41A zzi)Cf|K&~7;OTxroLQXHo6`k@H2k-<=iGe@D0faXymYEGwIU~fl2tnI@%!Y2oq{Uh z;2l3i5E+O)cx|R4gR!FZUnSkORl`Z4ex+F70}n={g!Nw&(PvoD?3}c%f}n@{ z60Uyj$#5lQE10NL9?kC^6c3fGsJh7>Dqm(M|Eb|wEgy9ySW=}9YuHKClEE}oC?ti@ z!_!0@EWM3|XK~n&$t>zzZ&%G+QJ>eXqWAX|yhTEwP_3>07{J*v$epVA!0HB-84qzs z!@v>>o|!2As`lQky2r(i)XQRA9S0xom-!MTNZI%Pv=WC{oJLq zTE)0pQjsc_+RSM3K5_hR*cANToQ224UE9iYm7iAkujKmqZACj!yHKykqfMFUNYUTb zA5)cHEW!k3>iOMF_UAa;A`POpY?u`yZUE7kJD_*Lk2$(Nt->p>x@UV6Z>qgGp4n9X zGQ-(lpq{x9|ASXOx!iImps?s7*4Dss>DK_SIiMsJA*`PpB97OdQQk=PuCfyO-i!1E zSS#e=bq8<@lJB`*Mq)DI$ud>t_Ey|<5|ttRZA|-}vB&csmeIS7=ZDD&jnf8iRTZ={ z5oZjfLs>OIj^7}3w99shb7 ze$xC(_qQ2fvCHwo(BNakM;h8A<9DUy+`e~?!Fg+LGVRBCPoOn36he$&^bcjW`oGXH z>=NVJ;;JdfJLC9(VDX^StIN>E8se#I+ZtL-lAN>xa$1S#WNlw&B7>yOtTKk!MFL;; z+jv#^FAoG>#0ETxX7xW|Q2Pc{WyPyJrlZ0>qsHpqx6GA3K2y>)!V?Q@RP*@gSY-T{ z!pq+J2m1}P644Q^UdN7fnp=tvOw~$6xAo?ck(L?$BOCERh=}*Wt2u)T#GQZbamR7@oQ8p}$<{^m)H!=a!e5hdhG#TF$ZMJ3SgFWn`L7koB++InL-8e`OIamCWCq}yr~61GNZ8l1-A*hh zLRC0NUhGELXqp!rWTqLG(o1ng7WV6yI(kW;MKb$jRoq_hi!T_CFvP*lzV1zCw$z_x zf6PLZ^M@>)Mi0hrvV4Wv6c_?Q)LP!7v*jM>7bet1)ZT0nXse4LTy$AfRU<*+;BHzTcL9 z;j7a0M25elPHEC$`tn<^#n*B*Z(1aB_Vojf?L??!k>>fxTW4QIh!uMG>5&>kvH$>Iefbj|ZYNKb zB*>UKWi&6z4F@c=JDb4kFD65&&FiXoW$M8=!}}T{3L{pxXTeOsl)kD z-}A~T#!Hr7Uj4>ob>m+@!7D&%MavD&PQA7h+a?E2FW#_)6i?VLTstcMp^e8nKVGy) z7rIYv>Up`Pa9LwrY1M>B9=|O5>}F-Fz-7`BaYMStU}eAcMoehwiX?8zG(bhOc6VmD z%g8)z@Sec~Kk+kpmu*I{e|9dmjJT2mFcK|KQW_9d7LBl0$Mzn6miD*$LLjAA!O3H=tL{ z5*9K%+ph|Gs;>K-{#8D-2*mU{04jVRwH2|UiaE-UPOz-<54Qa*zXJ*`&KZX$%#p5! z-?fWC*3e71jv?=)JKgfShxp?TJ-h-&_-4lOwXZX<^@yFO24)z|2sp|Flk+po(mPpW z_H9vyPlZ&~WAcM;@WL1%T?lhWv5BBTAxht#4Ki7EpTqZ=44BJUJkybLFL_*lHT@Xp z&?ZboMXIseACkQb7tIg?InAF#hkf9&3ABq>cCD8U^{gh-T8?UlyeiaUI0S^ppi_`M zx}!xUJ~;bOAm+a<_<<5LXi-orUZ`NJ{~txU=c&u)rhNE=`HcvGuqG?ReP~i{>2;i| zyb^qdx(!2Y7p>#ULtFpuB1n2n?@Fp{1&EY1vwbedl&g zwOy8VB=Z#Br?yL6YS~#MTZJZ#o~J82H65L_%f!tuKX~m3h7?@foG|;fDEO4q$5LE-6f-mcMmnJzZUP(Z;KemjU7yTPUZ+e~c%~n_4TEuJCMVydxvI7f7!sSgBj!;lJ1kbUX=fG=DyLX8Emq1f zk6-X_J&5t%2J|68YRvIRCBHKf&nn^HNKIGW+-yh7(oc`r8sfUbvSZ!n+HCw>Q=8NC(z_+B$WWQt7QR=%? zb>4I>zm>XzxTSMh1d4W$JF|E6o9{NDtw_PmSXB5m0bK+y5#CU~dUZDu0a7C(1Bl*a9)a&&K@|BB*hm#*p)G^b z$rV0=65>=4#mip-A0r_moLJ-Mp<3aEPo_)C`DE&kPN*8Udy!QjU8%-+xw%*+QiIE; z%&ibzmcG{TG2FG;ek5j&*Q5ln3t||t)O8ZY)O7;z9&E)@MfEWcCNZ5Es7Y0*CU`Al zv5=EV`4S|ZIwykSP%S7*K0java-websocket javax-servlets javax-servlets-2 + javax-sound javaxval jaxb jee-7 @@ -898,6 +899,7 @@ java-websocket javax-servlets javax-servlets-2 + javax-sound javaxval jaxb jee-7 From f8edd495bac3512646827398524b4f3b02dc26af Mon Sep 17 00:00:00 2001 From: Haroon Khan Date: Sat, 28 May 2022 04:27:51 +0100 Subject: [PATCH 2/7] [BAEL-5346] Code for @WebServiceServerTest article (#12229) --- .../spring-boot-testing-2/pom.xml | 39 ++++++++ .../webservice/InMemoryProductRepository.java | 15 ++++ .../baeldung/webservice/ProductEndpoint.java | 27 ++++++ .../webservice/ProductRepository.java | 9 ++ .../webservice/WebServiceApplication.java | 13 +++ .../webservice/config/WebServiceConfig.java | 44 +++++++++ .../generated/GetProductRequest.java | 64 +++++++++++++ .../generated/GetProductResponse.java | 64 +++++++++++++ .../webservice/generated/ObjectFactory.java | 56 ++++++++++++ .../webservice/generated/Product.java | 90 +++++++++++++++++++ .../webservice/generated/package-info.java | 2 + .../main/resources/webservice/products.xsd | 26 ++++++ .../ProductEndpointIntegrationTest.java | 69 ++++++++++++++ 13 files changed, 518 insertions(+) create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/InMemoryProductRepository.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductEndpoint.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductRepository.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/WebServiceApplication.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/config/WebServiceConfig.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductRequest.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductResponse.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/ObjectFactory.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/Product.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/package-info.java create mode 100644 spring-boot-modules/spring-boot-testing-2/src/main/resources/webservice/products.xsd create mode 100644 spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/webservice/ProductEndpointIntegrationTest.java diff --git a/spring-boot-modules/spring-boot-testing-2/pom.xml b/spring-boot-modules/spring-boot-testing-2/pom.xml index dfe41d684d..556142b480 100644 --- a/spring-boot-modules/spring-boot-testing-2/pom.xml +++ b/spring-boot-modules/spring-boot-testing-2/pom.xml @@ -19,13 +19,52 @@ org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-web-services + + + wsdl4j + wsdl4j + org.springframework.boot spring-boot-starter-test test + + org.springframework.ws + spring-ws-test + 3.1.3 + test + + + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + 0.15.1 + + + xjc + + generate + + + ${project.basedir}/src/main/resources/webservice + ${project.basedir}/src/main/java + com.baeldung.webservice.generated + false + true + + + + + + + com.baeldung.boot.Application diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/InMemoryProductRepository.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/InMemoryProductRepository.java new file mode 100644 index 0000000000..be11426aca --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/InMemoryProductRepository.java @@ -0,0 +1,15 @@ +package com.baeldung.webservice; + +import com.baeldung.webservice.generated.Product; +import org.springframework.stereotype.Component; + +@Component +public class InMemoryProductRepository implements ProductRepository { + + public Product findProduct(String id) { + Product product = new Product(); + product.setId(id); + product.setName("Product " + id); + return product; + } +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductEndpoint.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductEndpoint.java new file mode 100644 index 0000000000..c3ba5c04a8 --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductEndpoint.java @@ -0,0 +1,27 @@ +package com.baeldung.webservice; + +import com.baeldung.webservice.generated.GetProductRequest; +import com.baeldung.webservice.generated.GetProductResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.ws.server.endpoint.annotation.Endpoint; +import org.springframework.ws.server.endpoint.annotation.PayloadRoot; +import org.springframework.ws.server.endpoint.annotation.RequestPayload; +import org.springframework.ws.server.endpoint.annotation.ResponsePayload; + +@Endpoint +public class ProductEndpoint { + + private static final String NAMESPACE_URI = "http://baeldung.com/spring-boot-web-service"; + + @Autowired + private ProductRepository productRepository; + + + @PayloadRoot(namespace = NAMESPACE_URI, localPart = "getProductRequest") + @ResponsePayload + public GetProductResponse getProduct(@RequestPayload GetProductRequest request) { + GetProductResponse response = new GetProductResponse(); + response.setProduct(productRepository.findProduct(request.getId())); + return response; + } +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductRepository.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductRepository.java new file mode 100644 index 0000000000..35eb6fcb97 --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/ProductRepository.java @@ -0,0 +1,9 @@ +package com.baeldung.webservice; + +import com.baeldung.webservice.generated.Product; + +public interface ProductRepository { + + Product findProduct(String id); + +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/WebServiceApplication.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/WebServiceApplication.java new file mode 100644 index 0000000000..305738dcf2 --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/WebServiceApplication.java @@ -0,0 +1,13 @@ +package com.baeldung.webservice; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class WebServiceApplication { + + public static void main(String[] args) { + SpringApplication.run(WebServiceApplication.class, args); + } + +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/config/WebServiceConfig.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/config/WebServiceConfig.java new file mode 100644 index 0000000000..d444db09fb --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/config/WebServiceConfig.java @@ -0,0 +1,44 @@ +package com.baeldung.webservice.config; + +import org.springframework.boot.web.servlet.ServletRegistrationBean; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.ClassPathResource; +import org.springframework.ws.config.annotation.EnableWs; +import org.springframework.ws.transport.http.MessageDispatcherServlet; +import org.springframework.ws.wsdl.wsdl11.DefaultWsdl11Definition; +import org.springframework.xml.xsd.SimpleXsdSchema; +import org.springframework.xml.xsd.XsdSchema; + +@EnableWs +@Configuration +public class WebServiceConfig { + + @Bean + public ServletRegistrationBean messageDispatcherServlet(ApplicationContext applicationContext) { + MessageDispatcherServlet servlet = new MessageDispatcherServlet(); + servlet.setApplicationContext(applicationContext); + servlet.setTransformWsdlLocations(true); + return new ServletRegistrationBean<>(servlet, "/ws/*"); + } + + @Bean(name = "products") + public DefaultWsdl11Definition defaultWsdl11Definition(XsdSchema productsSchema) { + DefaultWsdl11Definition wsdl11Definition = new DefaultWsdl11Definition(); + wsdl11Definition.setPortTypeName("ProductsPort"); + wsdl11Definition.setLocationUri("/ws"); + wsdl11Definition.setTargetNamespace("http://baeldung.com/spring-boot-web-service"); + wsdl11Definition.setSchema(productsSchema); + return wsdl11Definition; + } + + @Bean + public XsdSchema productsSchema() { + return new SimpleXsdSchema(new ClassPathResource("webservice/products.xsd")); + } + + + + +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductRequest.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductRequest.java new file mode 100644 index 0000000000..d04302456b --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductRequest.java @@ -0,0 +1,64 @@ + +package com.baeldung.webservice.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "id" +}) +@XmlRootElement(name = "getProductRequest") +public class GetProductRequest { + + @XmlElement(required = true) + protected String id; + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductResponse.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductResponse.java new file mode 100644 index 0000000000..f8fcaa094f --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/GetProductResponse.java @@ -0,0 +1,64 @@ + +package com.baeldung.webservice.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for anonymous complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType>
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="product" type="{http://baeldung.com/spring-boot-web-service}product"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "", propOrder = { + "product" +}) +@XmlRootElement(name = "getProductResponse") +public class GetProductResponse { + + @XmlElement(required = true) + protected Product product; + + /** + * Gets the value of the product property. + * + * @return + * possible object is + * {@link Product } + * + */ + public Product getProduct() { + return product; + } + + /** + * Sets the value of the product property. + * + * @param value + * allowed object is + * {@link Product } + * + */ + public void setProduct(Product value) { + this.product = value; + } + +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/ObjectFactory.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/ObjectFactory.java new file mode 100644 index 0000000000..015ecc3f0a --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/ObjectFactory.java @@ -0,0 +1,56 @@ + +package com.baeldung.webservice.generated; + +import javax.xml.bind.annotation.XmlRegistry; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.baeldung.webservice.generated package. + *

An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.baeldung.webservice.generated + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link GetProductRequest } + * + */ + public GetProductRequest createGetProductRequest() { + return new GetProductRequest(); + } + + /** + * Create an instance of {@link GetProductResponse } + * + */ + public GetProductResponse createGetProductResponse() { + return new GetProductResponse(); + } + + /** + * Create an instance of {@link Product } + * + */ + public Product createProduct() { + return new Product(); + } + +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/Product.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/Product.java new file mode 100644 index 0000000000..5957aa44b4 --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/Product.java @@ -0,0 +1,90 @@ + +package com.baeldung.webservice.generated; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + *

Java class for product complex type. + * + *

The following schema fragment specifies the expected content contained within this class. + * + * 

+ * <complexType name="product">
+ *   <complexContent>
+ *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       <sequence>
+ *         <element name="id" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         <element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       </sequence>
+ *     </restriction>
+ *   </complexContent>
+ * </complexType>
+ *
+ * + * + */ +@XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "product", propOrder = { + "id", + "name" +}) +public class Product { + + @XmlElement(required = true) + protected String id; + @XmlElement(required = true) + protected String name; + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getId() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setId(String value) { + this.id = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/package-info.java b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/package-info.java new file mode 100644 index 0000000000..298ae9374b --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/java/com/baeldung/webservice/generated/package-info.java @@ -0,0 +1,2 @@ +@javax.xml.bind.annotation.XmlSchema(namespace = "http://baeldung.com/spring-boot-web-service", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package com.baeldung.webservice.generated; diff --git a/spring-boot-modules/spring-boot-testing-2/src/main/resources/webservice/products.xsd b/spring-boot-modules/spring-boot-testing-2/src/main/resources/webservice/products.xsd new file mode 100644 index 0000000000..3819b465be --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/main/resources/webservice/products.xsd @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/webservice/ProductEndpointIntegrationTest.java b/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/webservice/ProductEndpointIntegrationTest.java new file mode 100644 index 0000000000..ea9924193b --- /dev/null +++ b/spring-boot-modules/spring-boot-testing-2/src/test/java/com/baeldung/webservice/ProductEndpointIntegrationTest.java @@ -0,0 +1,69 @@ +package com.baeldung.webservice; + +import com.baeldung.webservice.generated.Product; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.webservices.server.WebServiceServerTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.core.io.ClassPathResource; +import org.springframework.ws.test.server.MockWebServiceClient; +import org.springframework.xml.transform.StringSource; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import static org.mockito.Mockito.when; +import static org.springframework.ws.test.server.RequestCreators.withPayload; +import static org.springframework.ws.test.server.ResponseMatchers.noFault; +import static org.springframework.ws.test.server.ResponseMatchers.payload; +import static org.springframework.ws.test.server.ResponseMatchers.validPayload; +import static org.springframework.ws.test.server.ResponseMatchers.xpath; + +@WebServiceServerTest +class ProductEndpointIntegrationTest { + + private static final Map NAMESPACE_MAPPING = createMapping(); + + @Autowired + private MockWebServiceClient client; + + @MockBean + private ProductRepository productRepository; + + @Test + void givenXmlRequest_whenServiceInvoked_thenValidResponse() throws IOException { + Product product = new Product(); + product.setId("1"); + product.setName("Product 1"); + + when(productRepository.findProduct("1")).thenReturn(product); + + StringSource request = new StringSource( + "" + + "1" + + "" + ); + StringSource response = new StringSource( + "" + + "" + + "1" + + "Product 1" + + "" + + "" + ); + + client.sendRequest(withPayload(request)) + .andExpect(noFault()) + .andExpect(validPayload(new ClassPathResource("webservice/products.xsd"))) + .andExpect(xpath("/bd:getProductResponse/bd:product[1]/bd:name", NAMESPACE_MAPPING) + .evaluatesTo("Product 1")) + .andExpect(payload(response)); + } + + private static Map createMapping() { + Map mapping = new HashMap<>(); + mapping.put("bd", "http://baeldung.com/spring-boot-web-service"); + return mapping; + } +} From 8b9055c1692c722e3371dfe7e9056d3deae1bef4 Mon Sep 17 00:00:00 2001 From: kwoyke Date: Sun, 29 May 2022 09:34:45 +0200 Subject: [PATCH 3/7] JAVA-10134: Cleanup POM properties (#12272) * JAVA-10134: Cleanup POM properties * JAVA-10134: Fix POM properties * JAVA-10134: Fix hamcrest dependency in libraries-apache-commons-collections * JAVA-10134: Fix java-hamcrest dependency * JAVA-10134: Add maven.compiler properties --- libraries-apache-commons-collections/pom.xml | 7 ++----- libraries-data-io/pom.xml | 1 - libraries-primitive/pom.xml | 6 ------ libraries-testing/pom.xml | 13 ------------- metrics/pom.xml | 3 ++- netflix-modules/mantis/pom.xml | 9 +++++++-- patterns/cqrs-es/pom.xml | 6 ------ 7 files changed, 11 insertions(+), 34 deletions(-) diff --git a/libraries-apache-commons-collections/pom.xml b/libraries-apache-commons-collections/pom.xml index c1a158b16e..ac7a327ead 100644 --- a/libraries-apache-commons-collections/pom.xml +++ b/libraries-apache-commons-collections/pom.xml @@ -20,14 +20,11 @@ org.hamcrest - java-hamcrest - ${org.hamcrest.java-hamcrest.version} + hamcrest + ${hamcrest.version} test - - 2.0.0.0 - \ No newline at end of file diff --git a/libraries-data-io/pom.xml b/libraries-data-io/pom.xml index 713c4342d1..640bf1ba07 100644 --- a/libraries-data-io/pom.xml +++ b/libraries-data-io/pom.xml @@ -107,7 +107,6 @@ 3.3.5 2.1 2.8.7 - 2.12.3 1.15 0.14.2 3.17.3 diff --git a/libraries-primitive/pom.xml b/libraries-primitive/pom.xml index 7d12e9a436..badcfc443d 100644 --- a/libraries-primitive/pom.xml +++ b/libraries-primitive/pom.xml @@ -69,12 +69,6 @@ 8.2.2 10.0.0 - 1.8 - 1.8 - 1.28 - 1.28 - 5.8.1 - 2.22.2 \ No newline at end of file diff --git a/libraries-testing/pom.xml b/libraries-testing/pom.xml index 4bc6eba7fc..279cb20225 100644 --- a/libraries-testing/pom.xml +++ b/libraries-testing/pom.xml @@ -171,15 +171,6 @@ - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${maven-compiler-plugin.source} - ${maven-compiler-plugin.target} - - @@ -196,10 +187,6 @@ 4.1.1 2.0.0.0 2.7.0 - 3.14.0 - 1.8 - 1.8 - 3.8.1 0.14.1 1.0.0 diff --git a/metrics/pom.xml b/metrics/pom.xml index 37b10ef484..d3731242c4 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -78,7 +78,7 @@ com.netflix.spectator spectator-api - 1.0.11 + ${spectator-api.version} @@ -90,6 +90,7 @@ 2.0.7.RELEASE 1.1.0 + 1.0.11 \ No newline at end of file diff --git a/netflix-modules/mantis/pom.xml b/netflix-modules/mantis/pom.xml index 0bab944b8a..50d9e61d9e 100644 --- a/netflix-modules/mantis/pom.xml +++ b/netflix-modules/mantis/pom.xml @@ -23,7 +23,7 @@ io.mantisrx mantis-runtime - 1.2.63 + ${mantis-runtime.version} org.slf4j @@ -38,7 +38,7 @@ net.andreinc.mockneat mockneat - 0.4.2 + ${mockneat.version} org.projectlombok @@ -63,4 +63,9 @@ + + 1.2.63 + 0.4.2 + + \ No newline at end of file diff --git a/patterns/cqrs-es/pom.xml b/patterns/cqrs-es/pom.xml index 20eeb09e35..1bd7453ea1 100644 --- a/patterns/cqrs-es/pom.xml +++ b/patterns/cqrs-es/pom.xml @@ -25,10 +25,4 @@ - - 1.8 - 1.8 - 1.18.12 - - \ No newline at end of file From a7cae2e766f2603dc3d2629607848779985c7060 Mon Sep 17 00:00:00 2001 From: kwoyke Date: Sun, 29 May 2022 09:52:09 +0200 Subject: [PATCH 4/7] JAVA-9609: Create manual test for POSTing with HttpURLConnection (#12263) --- .../PostJSONWithHttpURLConnection.java | 46 ---------------- ...stJSONWithHttpURLConnectionManualTest.java | 52 +++++++++++++++++++ 2 files changed, 52 insertions(+), 46 deletions(-) delete mode 100644 core-java-modules/core-java-networking-2/src/main/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnection.java create mode 100644 core-java-modules/core-java-networking-2/src/test/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnectionManualTest.java diff --git a/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnection.java b/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnection.java deleted file mode 100644 index 38b4a0411d..0000000000 --- a/core-java-modules/core-java-networking-2/src/main/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnection.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.baeldung.urlconnection; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.HttpURLConnection; -import java.net.URL; - -public class PostJSONWithHttpURLConnection { - - public static void main (String []args) throws IOException{ - //Change the URL with any other publicly accessible POST resource, which accepts JSON request body - URL url = new URL ("https://reqres.in/api/users"); - - HttpURLConnection con = (HttpURLConnection)url.openConnection(); - con.setRequestMethod("POST"); - - con.setRequestProperty("Content-Type", "application/json; utf-8"); - con.setRequestProperty("Accept", "application/json"); - - con.setDoOutput(true); - - //JSON String need to be constructed for the specific resource. - //We may construct complex JSON using any third-party JSON libraries such as jackson or org.json - String jsonInputString = "{\"name\": \"Upendra\", \"job\": \"Programmer\"}"; - - try(OutputStream os = con.getOutputStream()){ - byte[] input = jsonInputString.getBytes("utf-8"); - os.write(input, 0, input.length); - } - - int code = con.getResponseCode(); - System.out.println(code); - - try(BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream(), "utf-8"))){ - StringBuilder response = new StringBuilder(); - String responseLine = null; - while ((responseLine = br.readLine()) != null) { - response.append(responseLine.trim()); - } - System.out.println(response.toString()); - } - } - -} diff --git a/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnectionManualTest.java b/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnectionManualTest.java new file mode 100644 index 0000000000..e1a73a8de9 --- /dev/null +++ b/core-java-modules/core-java-networking-2/src/test/java/com/baeldung/urlconnection/PostJSONWithHttpURLConnectionManualTest.java @@ -0,0 +1,52 @@ +package com.baeldung.urlconnection; + +import org.junit.Test; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.URL; +import java.nio.charset.StandardCharsets; + +import static org.assertj.core.api.Assertions.assertThat; + +public class PostJSONWithHttpURLConnectionManualTest { + + @Test + public void givenValidURLAndPayload_whenPost_ThenSuccess() throws IOException { + //Change the URL with any other publicly accessible POST resource, which accepts JSON request body + URL url = new URL("https://reqres.in/api/users"); + + HttpURLConnection con = (HttpURLConnection) url.openConnection(); + con.setRequestMethod("POST"); + con.setRequestProperty("User-Agent", "AnyAgent"); + + con.setRequestProperty("Content-Type", "application/json"); + con.setRequestProperty("Accept", "application/json"); + + con.setDoOutput(true); + + //JSON String need to be constructed for the specific resource. + //We may construct complex JSON using any third-party JSON libraries such as jackson or org.json + String jsonInputString = "{\"name\": \"Upendra\", \"job\": \"Programmer\"}"; + + try (OutputStream os = con.getOutputStream()) { + byte[] input = jsonInputString.getBytes(StandardCharsets.UTF_8); + os.write(input, 0, input.length); + } + + assertThat(con.getResponseCode()).isEqualTo(201); + + try (BufferedReader br = new BufferedReader(new InputStreamReader(con.getInputStream(), StandardCharsets.UTF_8))) { + StringBuilder response = new StringBuilder(); + String responseLine = null; + while ((responseLine = br.readLine()) != null) { + response.append(responseLine.trim()); + } + assertThat(response).contains("createdAt"); + } + } + +} From 85d134952e4068bd14d27115b7c1e95669ad6f20 Mon Sep 17 00:00:00 2001 From: Dhawal Kapil Date: Sun, 29 May 2022 19:32:17 +0530 Subject: [PATCH 5/7] JAVA-11240 Moved spring-cloud to spring-cloud-modules --- pom.xml | 4 +- .../README.md | 0 .../pom.xml | 4 +- .../spring-cloud-archaius/README.md | 0 .../additional-sources-simple/pom.xml | 0 .../AdditionalSourcesSimpleApplication.java | 0 .../ApplicationPropertiesConfigurations.java | 0 .../ConfigPropertiesController.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/config.properties | 0 .../main/resources/other-config.properties | 0 .../ArchaiusAdditionalSourcesLiveTest.java | 0 .../additionalsources/SpringContextTest.java | 0 .../src/test/resources/logback-test.xml | 0 .../basic-config/pom.xml | 0 .../basic/BasicArchaiusApplication.java | 0 .../ConfigPropertiesController.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/config.properties | 0 .../src/main/resources/other.properties | 0 .../java/com/baeldung/SpringContextTest.java | 0 ...aiusBasicConfigurationIntegrationTest.java | 0 .../ArchaiusBasicConfigurationLiveTest.java | 0 .../archaius/basic/SpringContextTest.java | 0 .../src/test/resources/config.properties | 0 .../src/test/resources/logback-test.xml | 0 .../dynamodb-config/pom.xml | 0 .../DynamoSourcesApplication.java | 0 .../ApplicationPropertiesConfigurations.java | 0 .../config/DynamoDbConfiguration.java | 0 .../ConfigPropertiesController.java | 0 .../dynamodb/ArchaiusProperties.java | 0 .../ArchaiusPropertiesRepository.java | 0 .../src/main/resources/application.properties | 0 .../ArchaiusDynamoDbLiveTest.java | 0 .../dynamosources/SpringContextLiveTest.java | 0 .../extra-configs/pom.xml | 0 .../extraconfigs/ExtraConfigsApplication.java | 0 .../ConfigPropertiesController.java | 0 .../src/main/resources/application.properties | 0 .../other-config-dir/extra.properties | 0 .../src/main/resources/other.properties | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../ArchaiusExtraConfigsLiveTest.java | 0 .../src/test/resources/logback-test.xml | 0 .../spring-cloud-archaius/jdbc-config/pom.xml | 0 .../jdbconfig/JdbcSourcesApplication.java | 0 .../ApplicationPropertiesConfigurations.java | 0 .../ConfigPropertiesController.java | 0 .../archaius/jdbconfig/jdbc/Properties.java | 0 .../src/main/resources/application.properties | 0 .../jdbc-config/src/main/resources/data.sql | 0 .../jdbconfig/ArchaiusJDBCSourceLiveTest.java | 0 .../archaius/jdbconfig/SpringContextTest.java | 0 .../src/test/resources/logback-test.xml | 0 .../spring-cloud-archaius/pom.xml | 2 +- .../zookeeper-config/pom.xml | 0 .../ZookeeperConfigApplication.java | 0 .../config/ZookeeperConfigsInitializer.java | 0 .../ConfigPropertiesController.java | 0 .../src/main/resources/application.properties | 0 .../ArchaiusZookeeperLiveTest.java | 0 .../SpringContextLiveTest.java | 0 .../spring-cloud-aws/README.md | 0 .../spring-cloud-aws/pom.xml | 2 +- .../aws/InstanceProfileAwsApplication.java | 0 .../cloud/aws/SpringCloudAwsApplication.java | 0 .../aws/config/SpringCloudAwsConfig.java | 0 .../cloud/aws/ec2/EC2EnableMetadata.java | 0 .../spring/cloud/aws/ec2/EC2Metadata.java | 0 .../spring/cloud/aws/s3/SpringCloudS3.java | 0 .../cloud/aws/s3/SpringCloudS3Service.java | 0 .../cloud/aws/sns/SNSEndpointController.java | 0 .../cloud/aws/sns/SNSMessageSender.java | 0 .../spring/cloud/aws/sqs/SpringCloudSQS.java | 0 .../resources/InstanceProfileFormation.yaml | 0 .../application-instance-profile.properties | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/aws-config.xml | 0 .../src/main/resources/logback.xml | 0 .../cloud/aws/SpringCloudAwsTestUtil.java | 0 .../cloud/aws/SpringContextLiveTest.java | 0 .../cloud/aws/ec2/EC2MetadataLiveTest.java | 0 .../cloud/aws/rds/SpringCloudRDSLiveTest.java | 0 .../cloud/aws/s3/SpringCloudS3LiveTest.java | 0 .../sns/SNSEndpointControllerUnitTest.java | 0 .../cloud/aws/sns/SpringCloudSNSLiveTest.java | 0 .../spring/cloud/aws/sqs/Greeting.java | 0 .../cloud/aws/sqs/SpringCloudSQSLiveTest.java | 0 .../resources/application-test.properties | 0 .../src/test/resources/test-file-upload.txt | 0 .../spring-cloud-bootstrap/README.md | 0 .../book-service.properties | 0 .../application-config/discovery.properties | 0 .../application-config/gateway.properties | 0 .../rating-service.properties | 0 .../application-config/zipkin.properties | 0 .../spring-cloud-bootstrap/config/pom.xml | 0 .../bootstrap/config/ConfigApplication.java | 0 .../bootstrap/config/SecurityConfig.java | 0 .../src/main/resources/application.properties | 0 .../config/src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../customer-service/pom.xml | 0 .../baeldung/customerservice/Customer.java | 0 .../customerservice/CustomerApplication.java | 0 .../customerservice/CustomerService.java | 0 .../src/main/resources/application.properties | 0 .../src/test/resources/application.properties | 0 .../spring-cloud-bootstrap/discovery/pom.xml | 0 .../discovery/DiscoveryApplication.java | 0 .../bootstrap/discovery/SecurityConfig.java | 0 .../bootstrap/discovery/SessionConfig.java | 0 .../src/main/resources/bootstrap.properties | 0 .../discovery/src/main/resources/logback.xml | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../spring-cloud-bootstrap/gateway/pom.xml | 0 .../src/main/angular/ui/.angular-cli.json | 0 .../gateway/src/main/angular/ui/.editorconfig | 0 .../gateway/src/main/angular/ui/.gitignore | 0 .../gateway/src/main/angular/ui/README.md | 0 .../src/main/angular/ui/e2e/app.e2e-spec.ts | 0 .../gateway/src/main/angular/ui/e2e/app.po.ts | 0 .../src/main/angular/ui/e2e/tsconfig.e2e.json | 0 .../gateway/src/main/angular/ui/karma.conf.js | 0 .../gateway/src/main/angular/ui/package.json | 0 .../src/main/angular/ui/protractor.conf.js | 0 .../main/angular/ui/src/app/app.component.css | 0 .../angular/ui/src/app/app.component.html | 0 .../main/angular/ui/src/app/app.component.ts | 0 .../src/main/angular/ui/src/app/app.module.ts | 0 .../src/main/angular/ui/src/app/book.ts | 0 .../book-detail/book-detail.component.css | 0 .../book-detail/book-detail.component.html | 0 .../book/book-detail/book-detail.component.ts | 0 .../book/book-list/book-list.component.css | 0 .../book/book-list/book-list.component.html | 0 .../app/book/book-list/book-list.component.ts | 0 .../app/click-stop-propagation.directive.ts | 0 .../main/angular/ui/src/app/http.service.ts | 0 .../src/main/angular/ui/src/app/principal.ts | 0 .../src/main/angular/ui/src/app/rating.ts | 0 .../ui/src/app/rating/rating.component.css | 0 .../ui/src/app/rating/rating.component.html | 0 .../ui/src/app/rating/rating.component.ts | 0 .../src/main/angular/ui/src/assets/.gitkeep | 0 .../ui/src/environments/environment.prod.ts | 0 .../ui/src/environments/environment.ts | 0 .../src/main/angular/ui/src/favicon.ico | Bin .../src/main/angular/ui/src/index.html | 0 .../gateway/src/main/angular/ui/src/main.ts | 0 .../src/main/angular/ui/src/polyfills.ts | 0 .../src/main/angular/ui/src/styles.css | 0 .../gateway/src/main/angular/ui/src/test.ts | 0 .../src/main/angular/ui/src/tsconfig.app.json | 0 .../main/angular/ui/src/tsconfig.spec.json | 0 .../src/main/angular/ui/src/typings.d.ts | 0 .../gateway/src/main/angular/ui/tsconfig.json | 0 .../gateway/src/main/angular/ui/tslint.json | 0 .../gateway/AuthenticationController.java | 0 .../bootstrap/gateway/ErrorPageConfig.java | 0 .../bootstrap/gateway/GatewayApplication.java | 0 .../bootstrap/gateway/SecurityConfig.java | 0 .../bootstrap/gateway/SessionConfig.java | 0 .../bootstrap/gateway/client/book/Book.java | 0 .../gateway/client/book/BooksClient.java | 0 .../gateway/client/rating/Rating.java | 0 .../gateway/client/rating/RatingsClient.java | 0 .../controller/CombinedController.java | 0 .../filter/SessionSavingZuulPreFilter.java | 0 .../src/main/resources/bootstrap.properties | 0 .../gateway/src/main/resources/logback.xml | 0 .../main/resources/static/eureka/css/wro.css | 0 .../eureka/fonts/montserrat-webfont.eot | Bin .../eureka/fonts/montserrat-webfont.svg | 0 .../eureka/fonts/montserrat-webfont.ttf | Bin .../eureka/fonts/montserrat-webfont.woff | Bin .../eureka/fonts/varela_round-webfont.eot | Bin .../eureka/fonts/varela_round-webfont.svg | 0 .../eureka/fonts/varela_round-webfont.ttf | Bin .../eureka/fonts/varela_round-webfont.woff | Bin .../static/eureka/images/404-icon.png | Bin .../static/eureka/images/homepage-bg.jpg | Bin .../static/eureka/images/platform-bg.png | Bin .../eureka/images/platform-spring-xd.png | Bin .../images/spring-logo-eureka-mobile.png | Bin .../eureka/images/spring-logo-eureka.png | Bin .../main/resources/static/eureka/js/wro.js | 0 .../main/resources/static/home/favicon.ico | Bin .../src/main/resources/static/home/index.html | 0 .../resources/static/home/inline.bundle.js | 0 .../static/home/inline.bundle.js.map | 0 .../main/resources/static/home/main.bundle.js | 0 .../resources/static/home/main.bundle.js.map | 0 .../resources/static/home/polyfills.bundle.js | 0 .../static/home/polyfills.bundle.js.map | 0 .../resources/static/home/styles.bundle.js | 0 .../static/home/styles.bundle.js.map | 0 .../src/main/resources/static/index.html | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../cloud/bootstrap/gateway/LiveTest.java | 0 .../gateway/SpringContextLiveTest.java | 0 .../src/test/resources/bootstrap.properties | 0 .../order-service/order-client/pom.xml | 0 .../orderservice/client/OrderClient.java | 0 .../orderservice/client/OrderClientImpl.java | 0 .../orderservice/client/OrderDTO.java | 0 .../orderservice/client/OrderResponse.java | 0 .../src/main/resources/application.properties | 0 .../order-service/order-server/pom.xml | 0 .../java/com/baeldung/orderservice/Order.java | 0 .../orderservice/OrderApplication.java | 0 .../baeldung/orderservice/OrderService.java | 0 .../src/main/resources/application.properties | 0 .../order-service/pom.xml | 0 .../spring-cloud-bootstrap/pom.xml | 2 +- .../spring-cloud-bootstrap/svc-book/pom.xml | 0 .../svcbook/BookServiceApplication.java | 0 .../cloud/bootstrap/svcbook/DataLoader.java | 0 .../bootstrap/svcbook/SecurityConfig.java | 0 .../bootstrap/svcbook/SessionConfig.java | 0 .../cloud/bootstrap/svcbook/book/Book.java | 0 .../svcbook/book/BookController.java | 0 .../svcbook/book/BookNotFoundException.java | 0 .../svcbook/book/BookRepository.java | 0 .../bootstrap/svcbook/book/BookService.java | 0 .../src/main/resources/bootstrap.properties | 0 .../svc-book/src/main/resources/logback.xml | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../src/test/resources/bootstrap.properties | 0 .../spring-cloud-bootstrap/svc-rating/pom.xml | 0 .../cloud/bootstrap/svcrating/DataLoader.java | 0 .../svcrating/RatingServiceApplication.java | 0 .../bootstrap/svcrating/SecurityConfig.java | 0 .../bootstrap/svcrating/SessionConfig.java | 0 .../bootstrap/svcrating/rating/Rating.java | 0 .../rating/RatingCacheRepository.java | 0 .../svcrating/rating/RatingController.java | 0 .../rating/RatingNotFoundException.java | 0 .../svcrating/rating/RatingRepository.java | 0 .../svcrating/rating/RatingService.java | 0 .../src/main/resources/bootstrap.properties | 0 .../svc-rating/src/main/resources/logback.xml | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../src/test/resources/bootstrap.properties | 0 .../spring-cloud-bootstrap/zipkin/pom.xml | 0 .../bootstrap/zipkin/ZipkinApplication.java | 0 .../src/main/resources/bootstrap.properties | 0 .../zipkin/src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../spring-cloud-circuit-breaker/README.md | 0 .../spring-cloud-circuit-breaker/pom.xml | 2 +- .../baeldung/circuitbreaker/AlbumService.java | 0 .../baeldung/circuitbreaker/Controller.java | 0 .../baeldung/circuitbreaker/SpringApp.java | 0 .../main/resources/fallback-album-list.json | 0 .../spring-cloud-config/README.md | 0 .../spring-cloud-config/client/pom.xml | 0 .../cloud/config/client/ConfigClient.java | 0 .../src/main/resources/application.properties | 0 .../config/client/SpringContextLiveTest.java | 0 .../config-client-development.properties | 0 .../config-client-production.properties | 0 .../spring-cloud-config/pom.xml | 2 +- .../spring-cloud-config/server/pom.xml | 0 .../cloud/config/server/ConfigServer.java | 0 .../config/server/SecurityConfiguration.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/config-server.jks | Bin .../config/server/SpringContextTest.java | 0 .../src/test/resources/application.properties | 0 .../spring-cloud-connectors-heroku/README.md | 0 .../spring-cloud-connectors-heroku/pom.xml | 2 +- .../heroku/ConnectorsHerokuApplication.java | 0 .../cloud/connectors/heroku/book/Book.java | 0 .../heroku/book/BookController.java | 0 .../heroku/book/BookRepository.java | 0 .../connectors/heroku/book/BookService.java | 0 .../connectors/heroku/product/Product.java | 0 .../heroku/product/ProductController.java | 0 .../heroku/product/ProductRepository.java | 0 .../heroku/product/ProductService.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../connectors/heroku/SpringContextTest.java | 0 .../src/test/resources/application.properties | 0 .../spring-cloud-consul/README.md | 0 .../spring-cloud-consul/pom.xml | 2 +- .../discovery/DiscoveryClientApplication.java | 0 .../discovery/DiscoveryClientController.java | 0 .../health/ServiceDiscoveryApplication.java | 0 .../health/ServiceDiscoveryController.java | 0 .../consul/leadership/LeadershipElection.java | 0 .../DistributedPropertiesApplication.java | 0 .../DistributedPropertiesController.java | 0 .../cloud/consul/properties/MyProperties.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/bootstrap.yml | 0 .../src/main/resources/logback.xml | 0 .../cloud/consul/SpringContextLiveTest.java | 0 .../spring-cloud-contract/README.md | 0 .../spring-cloud-contract/pom.xml | 2 +- .../spring-cloud-contract-consumer/pom.xml | 0 ...pringCloudContractConsumerApplication.java | 0 .../controller/BasicMathController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../BasicMathControllerIntegrationTest.java | 0 .../spring-cloud-contract-producer/pom.xml | 0 ...pringCloudContractProducerApplication.java | 0 .../controller/EvenOddController.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../BaseTestClass.java | 0 ...uldReturnEvenWhenRequestParamIsEven.groovy | 0 ...houldReturnOddWhenRequestParamIsOdd.groovy | 0 .../spring-cloud-dapr/README.md | 0 .../dapr-config/basic-config.yaml | 0 .../dapr-config/consul-config.yaml | 0 .../dapr-config/consul-zipkin-config.yaml | 0 .../spring-cloud-dapr/gateway/pom.xml | 0 .../java/com/baeldung/gateway/GatewayApp.java | 0 .../main/resources/application-no-dapr.yml | 0 .../main/resources/application-with-dapr.yml | 0 .../spring-cloud-dapr/greeting/pom.xml | 0 .../java/com/baeldung/hello/GreetingApp.java | 0 .../baeldung/hello/GreetingController.java | 0 .../src/main/resources/application.yml | 0 .../spring-cloud-dapr/pom.xml | 2 +- .../spring-cloud-docker/README.md | 0 .../docker-compose-scale.yml | 0 .../spring-cloud-docker/docker-compose.yml | 0 .../docker-message-server/Dockerfile | 0 .../docker-message-server/pom.xml | 0 .../docker/DockerMessageController.java | 0 .../cloud/config/docker/DockerServer.java | 0 .../src/main/resources/application.properties | 0 .../docker-product-server/Dockerfile | 0 .../docker-product-server/pom.xml | 0 .../docker/DockerProductController.java | 0 .../cloud/config/docker/DockerServer.java | 0 .../src/main/resources/application.properties | 0 .../spring-cloud-docker/pom.xml | 2 +- .../README.md | 0 .../pom.xml | 2 +- .../spring-cloud-eureka-client/pom.xml | 0 .../client/EurekaClientApplication.java | 0 .../src/main/resources/application.properties | 0 .../spring-cloud-eureka-server/pom.xml | 0 .../server/EurekaServerApplication.java | 0 .../src/main/resources/application.properties | 0 .../spring-cloud-eureka/README.md | 0 .../spring-cloud-eureka/pom.xml | 2 +- .../pom.xml | 0 .../client/EurekaClientApplication.java | 0 .../controller/HelloWorldController.java | 0 .../main/resources/application-dev.properties | 0 .../src/main/resources/application.properties | 0 .../eureka/client/SpringContextTest.java | 0 .../spring-cloud-eureka-client/pom.xml | 0 .../client/EurekaClientApplication.java | 0 .../eureka/client/GreetingController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../eureka/client/SpringContextTest.java | 0 .../pom.xml | 0 .../baeldung/spring/cloud/Application.java | 0 .../spring/cloud/client/BooksClient.java | 0 .../com/baeldung/spring/cloud/model/Book.java | 0 .../spring/cloud/client/BookMocks.java | 0 .../client/BooksClientIntegrationTest.java | 0 .../cloud/client/EurekaContainerConfig.java | 0 ...oadBalancerBooksClientIntegrationTest.java | 0 .../cloud/client/MockBookServiceConfig.java | 0 .../spring/cloud/client/RibbonTestConfig.java | 0 .../ServiceDiscoveryBooksClientLiveTest.java | 0 .../spring/cloud/client/WireMockConfig.java | 0 .../resources/application-eureka-test.yml | 0 .../resources/application-ribbon-test.yml | 0 .../src/test/resources/application-test.yml | 0 .../resources/payload/get-books-response.json | 0 .../spring-cloud-eureka-feign-client/pom.xml | 0 .../feign/client/FeignClientApplication.java | 0 .../cloud/feign/client/GreetingClient.java | 0 .../feign/client/NoFeignClientController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../resources/templates/greeting-view.html | 0 .../cloud/feign/client/SpringContextTest.java | 0 .../spring-cloud-eureka-server/pom.xml | 0 .../server/EurekaServerApplication.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../eureka/server/SpringContextTest.java | 0 .../spring-cloud-functions/README.md | 0 .../spring-cloud-functions/pom.xml | 2 +- .../aws/CloudFunctionAwsApplication.java | 0 .../aws/StringReverseHandler.java | 0 .../cloudfunction/aws/functions/Greeter.java | 0 .../src/main/resources/application.properties | 0 .../aws/CloudFunctionApplicationUnitTest.java | 0 .../cloudfunction/aws/SpringContextTest.java | 0 .../src/test/resources/logback-test.xml | 0 .../spring-cloud-gateway/README-OAuth.md | 0 .../spring-cloud-gateway/README.md | 0 .../spring-cloud-gateway/baeldung-realm.json | 0 .../spring-cloud-gateway/pom.xml | 2 +- .../CustomFiltersGatewayApplication.java | 0 .../gatewayapp/config/WebClientConfig.java | 0 .../ChainRequestGatewayFilterFactory.java | 0 .../LoggingGatewayFilterFactory.java | 0 .../ModifyRequestGatewayFilterFactory.java | 0 .../ModifyResponseGatewayFilterFactory.java | 0 .../global/FirstPreLastPostGlobalFilter.java | 0 .../LoggingGlobalFiltersConfigurations.java | 0 .../global/LoggingGlobalPreFilter.java | 0 .../routes/ServiceRouteConfiguration.java | 0 .../SecondServiceApplication.java | 0 .../web/SecondServiceRestController.java | 0 .../service/ServiceApplication.java | 0 .../service/web/ServiceRestController.java | 0 .../CustomPredicatesApplication.java | 0 .../config/CustomPredicatesConfig.java | 0 .../GoldenCustomerRoutePredicateFactory.java | 0 .../service/GoldenCustomerService.java | 0 .../IntroductionGatewayApplication.java | 0 .../oauth/backend/QuotesApplication.java | 0 .../oauth/backend/domain/Quote.java | 0 .../oauth/backend/web/QuoteApi.java | 0 .../ResourceServerGatewayApplication.java | 0 .../KeycloakReactiveTokenInstrospector.java | 0 .../rewrite/URLRewriteGatewayApplication.java | 0 .../rewrite/routes/DynamicRewriteRoute.java | 0 .../WebFilterGatewayApplication.java | 0 .../config/ModifyBodyRouteConfig.java | 0 .../RequestRateLimiterResolverConfig.java | 0 .../resources/application-customroutes.yml | 0 .../main/resources/application-nosecurity.yml | 0 .../resources/application-oauth-client.yml | 0 .../resources/application-resource-server.yml | 0 .../resources/application-url-rewrite.yml | 0 .../main/resources/application-webfilters.yml | 0 .../src/main/resources/application.yml | 0 ...ustomfilters-global-application.properties | 0 .../introduction-application.properties | 0 .../src/main/resources/logback.xml | 0 .../resources/quotes-application.properties | 0 .../secondservice-application.properties | 0 .../resources/service-application.properties | 0 .../gatewayapp/CustomFiltersLiveTest.java | 0 .../gatewayapp/utils/LoggerListAppender.java | 0 .../SecondServiceIntegrationTest.java | 0 .../secondservice/SpringContextTest.java | 0 .../service/ServiceIntegrationTest.java | 0 .../service/SpringContextTest.java | 0 .../CustomPredicatesApplicationLiveTest.java | 0 .../introduction/SpringContextTest.java | 0 .../URLRewriteGatewayApplicationLiveTest.java | 0 .../RedisWebFilterFactoriesLiveTest.java | 0 .../WebFilterFactoriesLiveTest.java | 0 .../OAuth_Gateway.postman_collection.json | 0 .../src/test/resources/logback-test.xml | 0 .../spring-cloud-hystrix/README.md | 0 .../feign-rest-consumer/pom.xml | 0 .../hystrix/rest/consumer/GreetingClient.java | 0 .../rest/consumer/GreetingController.java | 0 .../RestConsumerFeignApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../resources/templates/greeting-view.html | 0 .../rest/consumer/SpringContextTest.java | 0 .../spring-cloud-hystrix/pom.xml | 2 +- .../rest-consumer/pom.xml | 0 .../rest/consumer/GreetingController.java | 0 .../rest/consumer/GreetingService.java | 0 .../consumer/RestConsumerApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../resources/templates/greeting-view.html | 0 .../rest/consumer/SpringContextTest.java | 0 .../rest-producer/pom.xml | 0 .../rest/producer/GreetingController.java | 0 .../rest/producer/GreetingControllerImpl.java | 0 .../producer/RestProducerApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../rest/producer/SpringContextTest.java | 0 .../spring-cloud-kubernetes/README.md | 0 .../client-service/.gitignore | 0 .../client-service/Dockerfile | 0 .../client-service/client-config.yaml | 0 .../client-service-deployment.yaml | 0 .../kubernetes-guide/client-service/pom.xml | 0 .../cloud/kubernetes/client/Application.java | 0 .../cloud/kubernetes/client/ClientConfig.java | 0 .../kubernetes/client/ClientController.java | 0 .../client/RibbonConfiguration.java | 0 .../client/TravelAgencyService.java | 0 .../src/main/resources/application.yaml | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../deployment-travel-client.sh | 0 .../travel-agency-service/Dockerfile | 0 .../mongo-deployment.yaml | 0 .../travel-agency-service/pom.xml | 0 .../travel-agency-service/secret.yaml | 0 .../kubernetes/travelagency/Application.java | 0 .../controller/TravelAgencyController.java | 0 .../travelagency/model/TravelDeal.java | 0 .../repository/TravelDealRepository.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback-spring.xml | 0 .../src/main/resources/logback.xml | 0 .../travelagency/SpringContextTest.java | 0 .../travel-agency-deployment.yaml | 0 .../demo-backend/.gitignore | 0 .../demo-backend/Dockerfile | 0 .../kubernetes-minikube/demo-backend/pom.xml | 0 .../backend/KubernetesBackendApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../demo-frontend/.gitignore | 0 .../demo-frontend/Dockerfile | 0 .../kubernetes-minikube/demo-frontend/pom.xml | 0 .../KubernetesFrontendApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../backend-deployment.yaml | 0 .../frontend-deployment.yaml | 0 .../liveness-example/Dockerfile | 0 .../liveness-example/pom.xml | 0 .../com/baeldung/liveness/Application.java | 0 .../health/CustomHealthIndicator.java | 0 .../resources/application.properties | 0 .../src/main/resources/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../src/test/resources/logback-test.xml | 0 .../liveness-example-k8s-template.yaml | 0 .../readiness-example-k8s-template.yaml | 0 .../readiness-example/Dockerfile | 0 .../readiness-example/pom.xml | 0 .../com/baeldung/readiness/Application.java | 0 .../health/CustomHealthIndicator.java | 0 .../resources/application.properties | 0 .../src/main/resources/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../src/test/resources/logback-test.xml | 0 .../spring-cloud-kubernetes/pom.xml | 2 +- .../spring-cloud-loadbalancer/README.md | 0 .../spring-cloud-loadbalancer/pom.xml | 2 +- .../.gitignore | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../spring-cloud-loadbalancer-client/mvnw | 0 .../spring-cloud-loadbalancer-client/mvnw.cmd | 0 .../spring-cloud-loadbalancer-client/pom.xml | 0 .../client/ClientApplication.java | 0 .../src/main/resources/application.properties | 0 .../.gitignore | 0 .../.mvn/wrapper/MavenWrapperDownloader.java | 0 .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../spring-cloud-loadbalancer-server/mvnw | 0 .../spring-cloud-loadbalancer-server/mvnw.cmd | 0 .../spring-cloud-loadbalancer-server/pom.xml | 0 .../server/ServerApplication.java | 0 .../src/main/resources/application.properties | 0 .../spring-cloud-netflix-feign/README.md | 0 .../spring-cloud-netflix-feign/pom.xml | 0 .../netflix/feign/ExampleApplication.java | 0 .../feign/client/JSONPlaceHolderClient.java | 0 .../feign/config/ClientConfiguration.java | 0 .../feign/config/CustomErrorDecoder.java | 0 .../feign/exception/BadRequestException.java | 0 .../feign/exception/NotFoundException.java | 0 .../hystrix/JSONPlaceHolderFallback.java | 0 .../cloud/netflix/feign/model/Post.java | 0 .../feign/service/JSONPlaceHolderService.java | 0 .../impl/JSONPlaceHolderServiceImpl.java | 0 .../src/main/resources/application.properties | 0 .../netflix/feign/NetflixFeignUnitTest.java | 0 .../README.md | 0 .../spring-cloud-open-service-broker/pom.xml | 2 +- .../ServiceBrokerApplication.java | 0 .../config/CatalogConfiguration.java | 0 .../mail/MailController.java | 0 .../openservicebroker/mail/MailService.java | 0 .../mail/MailServiceBinding.java | 0 .../mail/MailServiceInstance.java | 0 .../MailServiceInstanceBindingService.java | 0 .../services/MailServiceInstanceService.java | 0 .../src/main/resources/application.yml | 0 ...ServiceInstanceBindingServiceUnitTest.java | 0 .../MailServiceInstanceServiceUnitTest.java | 0 .../spring-cloud-openfeign/README.md | 0 .../spring-cloud-openfeign/pom.xml | 0 .../cloud/openfeign/ExampleApplication.java | 0 .../client/JSONPlaceHolderClient.java | 0 .../cloud/openfeign/client/PaymentClient.java | 0 .../cloud/openfeign/client/UserClient.java | 0 .../openfeign/config/ClientConfiguration.java | 0 .../openfeign/config/CustomErrorDecoder.java | 0 .../cloud/openfeign/config/FeignConfig.java | 0 .../controller/PaymentController.java | 0 .../exception/BadRequestException.java | 0 .../exception/NotFoundException.java | 0 .../fileupload/config/ExceptionMessage.java | 0 .../fileupload/config/FeignSupportConfig.java | 0 .../config/RetreiveMessageErrorDecoder.java | 0 .../fileupload/controller/FileController.java | 0 .../fileupload/service/UploadClient.java | 0 .../fileupload/service/UploadResource.java | 0 .../fileupload/service/UploadService.java | 0 .../hystrix/JSONPlaceHolderFallback.java | 0 .../cloud/openfeign/model/Payment.java | 0 .../baeldung/cloud/openfeign/model/Post.java | 0 .../OAuth2WebSecurityConfigurerAdapter.java | 0 .../OAuthClientCredentialsFeignManager.java | 0 .../oauthfeign/OAuthFeignConfig.java | 0 .../service/JSONPlaceHolderService.java | 0 .../impl/JSONPlaceHolderServiceImpl.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/fileupload.txt | 0 .../OpenFeignFileUploadLiveTest.java | 0 .../cloud/openfeign/OpenFeignManualTest.java | 0 .../openfeign/OpenFeignOAuth2ManualTest.java | 0 .../cloud/openfeign/SpringContextTest.java | 0 .../spring-cloud-rest/.gitignore | 0 .../spring-cloud-rest/README.md | 0 .../application-config/discovery.properties | 0 .../application-config/resource.properties | 0 .../spring-cloud-rest/pom.xml | 2 +- .../spring-cloud-rest-books-api/pom.xml | 0 .../com/baeldung/BooksApiApplication.java | 0 .../main/java/com/baeldung/SessionConfig.java | 0 .../persistence/dao/BookRepository.java | 0 .../com/baeldung/persistence/model/Book.java | 0 .../src/main/resources/bootstrap.properties | 0 .../src/main/resources/logback.xml | 0 .../com/baeldung/BooksApiIntegrationTest.java | 0 .../java/com/baeldung/RestApiLiveTest.java | 0 .../java/com/baeldung/SessionLiveTest.java | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../src/test/resources/application.properties | 0 .../.gitignore | 0 .../spring-cloud-rest-config-server/pom.xml | 0 .../SpringCloudRestConfigApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../.gitignore | 0 .../pom.xml | 0 .../main/java/com/baeldung/SessionConfig.java | 0 .../SpringCloudRestServerApplication.java | 0 .../src/main/resources/bootstrap.properties | 0 .../src/main/resources/logback.xml | 0 .../SpringCloudRestServerIntegrationTest.java | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../spring-cloud-rest-reviews-api/pom.xml | 0 .../baeldung/BookReviewsApiApplication.java | 0 .../main/java/com/baeldung/SessionConfig.java | 0 .../persistence/dao/BookReviewRepository.java | 0 .../persistence/model/BookReview.java | 0 .../src/main/resources/bootstrap.properties | 0 .../src/main/resources/logback.xml | 0 .../BookReviewsApiIntegrationTest.java | 0 .../java/com/baeldung/RestApiLiveTest.java | 0 .../com/baeldung/SpringContextLiveTest.java | 0 .../src/test/resources/application.properties | 0 .../spring-cloud-ribbon-client/README.md | 0 .../spring-cloud-ribbon-client/pom.xml | 2 +- .../client/RestTemplateConfiguration.java | 0 .../ribbon/client/RibbonConfiguration.java | 0 .../ribbon/client/ServerLocationApp.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../ServerLocationAppIntegrationTest.java | 0 .../cloud/ribbon/client/TestConfig.java | 0 .../spring-cloud-ribbon-retry/README.md | 0 .../spring-cloud-ribbon-retry/pom.xml | 2 +- .../ribbon-client-service/pom.xml | 0 .../cloud/ribbon/retry/RibbonClientApp.java | 0 .../ExponentialBackoffRetryFactory.java | 0 .../ExponentialRandomBackoffRetryFactory.java | 0 .../backoff/FixedBackoffRetryFactory.java | 0 .../retry/config/RibbonConfiguration.java | 0 .../WeatherClientRibbonConfiguration.java | 0 .../controller/RibbonClientController.java | 0 .../src/main/resources/application.yml | 0 .../retry/RibbonRetryFailureManualTest.java | 0 .../retry/RibbonRetrySuccessManualTest.java | 0 .../ribbon-weather-service/pom.xml | 0 .../ribbon/retry/RibbonWeatherServiceApp.java | 0 .../cloud/ribbon/retry/WeatherController.java | 0 .../src/main/resources/application.properties | 0 .../spring-cloud-security/README.md | 0 .../spring-cloud-security/alias.rtf | 0 .../spring-cloud-security/auth-client/pom.xml | 0 .../src/main/java/com/baeldung/CloudSite.java | 0 .../config/SiteSecurityConfigurer.java | 0 .../controller/CloudSiteController.java | 0 .../com/baeldung/filters/SimpleFilter.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../main/resources/templates/personinfo.html | 0 .../java/com/baeldung/SpringContextTest.java | 0 ...Springoath2ApplicationIntegrationTest.java | 0 .../auth-resource/pom.xml | 0 .../main/java/com/baeldung/Application.java | 0 .../baeldung/config/ResourceConfigurer.java | 0 .../controller/PersonInfoController.java | 0 .../controller/ResourceController.java | 0 .../main/java/com/baeldung/model/Person.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 ...rsonserviceApplicationIntegrationTest.java | 0 .../spring-cloud-security/auth-server/pom.xml | 0 .../main/java/com/baeldung/AuthServer.java | 0 .../baeldung/config/AuthServerConfigurer.java | 0 .../com/baeldung/config/WebMvcConfig.java | 0 .../config/WebSecurityConfigurer.java | 0 .../src/main/resources/application.yml | 0 .../main/resources/certificate/mykeystore.jks | Bin .../src/main/resources/logback.xml | 0 .../src/main/resources/templates/login.html | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../spring-cloud-security/mykeystore.jks | Bin .../spring-cloud-security/pom.xml | 2 +- .../spring-cloud-security/pubkey.txt | 0 .../spring-cloud-sentinel/README.md | 0 .../spring-cloud-sentinel/pom.xml | 2 +- .../cloud/sentinel/SentinelApplication.java | 0 .../config/SentinelAspectConfiguration.java | 0 .../controller/GreetingController.java | 0 .../sentinel/service/GreetingService.java | 0 .../spring-cloud-stream-starters/README.md | 0 .../bash/hadoop.sh | 0 .../hdfs/application.properties | 0 .../spring-cloud-stream-starters/hdfs/hdfs.sh | 0 .../twitter/application.properties | 0 .../twitter/twitter.sh | 0 .../twitterhdfs/.gitignore | 0 .../twitterhdfs/pom.xml | 0 .../twitterhdfs/aggregate/AggregateApp.java | 0 .../twitterhdfs/processor/ProcessorApp.java | 0 .../baeldung/twitterhdfs/sink/SinkApp.java | 0 .../twitterhdfs/source/SourceApp.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../aggregate/SpringContextTest.java | 0 .../spring-cloud-stream/README.md | 0 .../spring-cloud-stream/pom.xml | 2 +- .../spring-cloud-stream-kafka/README.md | 0 .../spring-cloud-stream-kafka/pom.xml | 0 .../com/baeldung/AvroKafkaApplication.java | 0 .../baeldung/config/SchemRegistryConfig.java | 0 .../com/baeldung/consumer/AvroConsumer.java | 0 .../baeldung/controller/AvroController.java | 0 .../com/baeldung/producer/AvroProducer.java | 0 .../src/main/resources/application.yaml | 0 .../main/resources/employee-key-schema.avsc | 0 .../src/main/resources/employee-schema.avsc | 0 .../spring-cloud-stream-kinesis/pom.xml | 0 .../java/com/baeldung/KinesisApplication.java | 0 .../src/main/resources/application.properties | 0 .../KinesisApplicationIntegrationTest.java | 0 .../src/test/resources/application.properties | 0 .../spring-cloud-stream-rabbit/pom.xml | 0 .../MultipleOutputsServiceApplication.java | 0 ...tputsWithConditionsServiceApplication.java | 0 .../rabbit/MyLoggerServiceApplication.java | 0 .../messages/TextPlainMessageConverter.java | 0 .../cloud/stream/rabbit/model/LogMessage.java | 0 .../stream/rabbit/processor/MyProcessor.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 ...putsServiceApplicationIntegrationTest.java | 0 ...sWithConditionsServiceIntegrationTest.java | 0 .../MyLoggerApplicationIntegrationTest.java | 0 .../spring-cloud-task/README.md | 0 .../spring-cloud-task/pom.xml | 2 +- .../springcloudtaskbatch/.gitignore | 0 .../springcloudtaskbatch/pom.xml | 0 .../task/HelloWorldTaskConfigurer.java | 0 .../com/baeldung/task/JobConfiguration.java | 0 .../main/java/com/baeldung/task/TaskDemo.java | 0 .../java/com/baeldung/task/TaskListener.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../src/test/resources/application.yml | 0 .../springcloudtasksink/.gitignore | 0 .../springcloudtasksink/pom.xml | 0 .../SpringCloudTaskSinkApplication.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 ...oudTaskSinkApplicationIntegrationTest.java | 0 .../TaskSinkConfiguration.java | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../spring-cloud-vault/.gitignore | 0 .../spring-cloud-vault/README.md | 0 .../spring-cloud-vault/database-setup.sql | 0 .../spring-cloud-vault/pom.xml | 2 +- .../spring-cloud-vault/sample-policy.hcl | 0 .../spring/cloud/vaultsample/AccountRepo.java | 0 .../cloud/vaultsample/AccountResource.java | 0 .../cloud/vaultsample/SecretResource.java | 0 .../vaultsample/VaultSampleApplication.java | 0 .../cloud/vaultsample/domain/Account.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/vault.jks | Bin .../vaultsample/SpringContextLiveTest.java | 0 .../VaultSampleApplicationLiveTest.java | 0 .../src/test/resources/bootstrap.properties | 0 .../src/test/resources/vault.jks | Bin .../src/test/vault-config/localhost.cert | 0 .../src/test/vault-config/localhost.key | 0 .../src/test/vault-config/vault-test.hcl | 0 .../spring-cloud-vault/vault-cheatsheet.txt | 0 .../spring-cloud-vault/vault-env.bat | 0 .../spring-cloud-vault/vault-env.sh | 0 .../spring-cloud-vault/vault-start.bat | 0 .../spring-cloud-vault/vault-start.sh | 0 .../spring-cloud-vault/vault-unseal.bat | 0 .../spring-cloud-vault/vault-unseal.sh | 0 .../spring-cloud-zookeeper/Greeting/pom.xml | 0 .../cloud/greeting/GreetingApplication.java | 0 .../cloud/greeting/GreetingController.java | 0 .../cloud/greeting/HelloWorldClient.java | 0 .../src/main/resources/application.yml | 0 .../Greeting/src/main/resources/logback.xml | 0 .../resources/templates/greeting-view.html | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../spring-cloud-zookeeper/HelloWorld/pom.xml | 0 .../helloworld/HelloWorldApplication.java | 0 .../helloworld/HelloWorldController.java | 0 .../src/main/resources/application.yml | 0 .../HelloWorld/src/main/resources/logback.xml | 0 .../cloud/helloworld/SpringContextTest.java | 0 .../spring-cloud-zookeeper/README.md | 0 .../spring-cloud-zookeeper/pom.xml | 2 +- .../README.md | 0 .../eureka-client/pom.xml | 0 .../client/EurekaClientApplication.java | 0 .../eureka/client/GreetingController.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../eureka/client/SpringContextTest.java | 0 .../eureka-server/pom.xml | 0 .../server/EurekaServerApplication.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../eureka/server/SpringContextTest.java | 0 .../pom.xml | 2 +- .../zuul-server/pom.xml | 0 .../spring/cloud/zuul/config/ZuulConfig.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../cloud/zuul/config/SpringContextTest.java | 0 .../spring-cloud-zuul-fallback/README.md | 0 .../api-gateway/pom.xml | 0 .../apigateway/ApiGatewayApplication.java | 0 .../fallback/GatewayClientResponse.java | 0 .../fallback/GatewayServiceFallback.java | 0 .../fallback/WeatherServiceFallback.java | 0 .../src/main/resources/application.yml | 0 .../ApiGatewayApplicationIntegrationTest.java | 0 .../GatewayServiceFallbackUnitTest.java | 0 .../WeatherServiceFallbackUnitTest.java | 0 .../src/test/resources/logback.xml | 0 .../spring-cloud-zuul-fallback/pom.xml | 4 +- .../weather-service/pom.xml | 0 .../weatherservice/WeatherController.java | 0 .../WeatherServiceApplication.java | 0 .../src/main/resources/application.yml | 0 .../WeatherControllerIntegrationTest.java | 0 ...therServiceApplicationIntegrationTest.java | 0 .../spring-cloud-zuul/README.md | 0 .../spring-cloud-zuul/pom.xml | 2 +- .../spring-zuul-foos-resource/pom.xml | 0 .../config/ResourceServerApplication.java | 0 .../config/ResourceServerWebConfig.java | 0 .../web/controller/FooController.java | 0 .../main/java/com/baeldung/web/dto/Foo.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logback.xml | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../spring-zuul-post-filter/.gitignore | 0 .../spring-zuul-post-filter/pom.xml | 0 .../baeldung/ZuulPostFilterApplication.java | 0 .../controllers/GreetingController.java | 0 .../baeldung/filters/ResponseLogFilter.java | 0 .../src/main/resources/application.yml | 0 .../com/baeldung/ZuulPostFilterLiveTest.java | 0 .../spring-zuul-rate-limiting/pom.xml | 0 .../ZuulRatelimitDemoApplication.java | 0 .../controller/GreetingController.java | 0 .../src/main/resources/application.yml | 0 .../GreetingControllerIntegrationTest.java | 0 .../controller/SpringContextTest.java | 0 .../src/test/resources/application.properties | 0 .../src/test/resources/logback.xml | 0 .../spring-zuul-ui/README.md | 0 .../spring-cloud-zuul/spring-zuul-ui/pom.xml | 0 .../com/baeldung/config/CustomZuulFilter.java | 0 .../com/baeldung/config/UiApplication.java | 0 .../java/com/baeldung/config/UiWebConfig.java | 0 .../filter/CustomZuulErrorApplication.java | 0 .../zuul/filter/CustomZuulErrorFilter.java | 0 .../cloud/zuul/filter/ZuulConfiguration.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 .../src/main/resources/templates/index.html | 0 .../resources/angular-utf8-base64.min.js | 0 .../java/com/baeldung/SpringContextTest.java | 0 .../filter/CustomZuulErrorFilterLiveTest.java | 0 .../test/java/com/baeldung/web/LiveTest.java | 0 .../src/test/resources/.gitignore | 0 .../resources/persistence-mysql.properties | 0 .../bin/eureka-client/pom.xml | 42 --------------- .../src/main/resources/application.yml | 13 ----- .../bin/eureka-server/pom.xml | 43 --------------- .../bin/pom.xml | 31 ----------- .../bin/zuul-server/pom.xml | 50 ------------------ .../src/main/resources/application.properties | 9 ---- .../src/main/resources/application.yml | 7 --- 934 files changed, 35 insertions(+), 230 deletions(-) rename {spring-cloud => spring-cloud-modules}/README.md (100%) rename {spring-cloud => spring-cloud-modules}/pom.xml (97%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/AdditionalSourcesSimpleApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/config/ApplicationPropertiesConfigurations.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/controller/ConfigPropertiesController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/main/resources/config.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/main/resources/other-config.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/ArchaiusAdditionalSourcesLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/additional-sources-simple/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/BasicArchaiusApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/controller/ConfigPropertiesController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/main/resources/config.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/main/resources/other.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/test/resources/config.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/basic-config/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/DynamoSourcesApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/ApplicationPropertiesConfigurations.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/DynamoDbConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/controller/ConfigPropertiesController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusProperties.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusPropertiesRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/ArchaiusDynamoDbLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/ExtraConfigsApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/controllers/ConfigPropertiesController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/main/resources/other-config-dir/extra.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/main/resources/other.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/spring/cloud/archaius/extraconfigs/ArchaiusExtraConfigsLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/extra-configs/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/JdbcSourcesApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/config/ApplicationPropertiesConfigurations.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/controller/ConfigPropertiesController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/jdbc/Properties.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/main/resources/data.sql (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/ArchaiusJDBCSourceLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/jdbc-config/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/pom.xml (97%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/zookeeper-config/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ZookeeperConfigApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/config/ZookeeperConfigsInitializer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/controller/ConfigPropertiesController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/zookeeper-config/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ArchaiusZookeeperLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/pom.xml (98%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/InstanceProfileAwsApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/config/SpringCloudAwsConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2EnableMetadata.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2Metadata.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3Service.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSMessageSender.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQS.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/resources/InstanceProfileFormation.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/resources/application-instance-profile.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/resources/aws-config.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringCloudAwsTestUtil.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/ec2/EC2MetadataLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/rds/SpringCloudRDSLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3LiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointControllerUnitTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SpringCloudSNSLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/Greeting.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQSLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/resources/application-test.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-aws/src/test/resources/test-file-upload.txt (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/application-config/book-service.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/application-config/discovery.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/application-config/gateway.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/application-config/rating-service.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/application-config/zipkin.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/config/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/config/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/config/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/config/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/customer-service/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/Customer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/customer-service/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/customer-service/src/test/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/discovery/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/discovery/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/discovery/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/.angular-cli.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/.editorconfig (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.po.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/karma.conf.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/package.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/protractor.conf.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.css (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/http.service.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/principal.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.css (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/assets/.gitkeep (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.prod.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/favicon.ico (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/index.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/main.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/polyfills.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/styles.css (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/test.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.app.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.spec.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/typings.d.ts (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/tsconfig.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/angular/ui/tslint.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/css/wro.css (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/404-icon.png (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-bg.png (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/js/wro.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/favicon.ico (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/index.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js.map (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js.map (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js.map (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js.map (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/main/resources/static/index.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/gateway/src/test/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-client/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/order-server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/order-service/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/pom.xml (93%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-book/src/test/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/svc-rating/src/test/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/zipkin/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/zipkin/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/zipkin/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-bootstrap/zipkin/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-circuit-breaker/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-circuit-breaker/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/AlbumService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/Controller.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/SpringApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-circuit-breaker/src/main/resources/fallback-album-list.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/client/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/config-repo/config-client-development.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/config-repo/config-client-production.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/pom.xml (95%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/server/src/main/resources/config-server.jks (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-config/server/src/test/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/pom.xml (97%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/ConnectorsHerokuApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/Book.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/Product.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-connectors-heroku/src/test/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/pom.xml (97%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/leadership/LeadershipElection.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/MyProperties.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/resources/bootstrap.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-consul/src/test/java/com/baeldung/spring/cloud/consul/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/pom.xml (97%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/SpringCloudContractConsumerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathControllerIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/SpringCloudContractProducerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/controller/EvenOddController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/spring/cloud/springcloudcontractproducer/BaseTestClass.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnEvenWhenRequestParamIsEven.groovy (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnOddWhenRequestParamIsOdd.groovy (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/dapr-config/basic-config.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/dapr-config/consul-config.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/dapr-config/consul-zipkin-config.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/gateway/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/gateway/src/main/java/com/baeldung/gateway/GatewayApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/gateway/src/main/resources/application-no-dapr.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/gateway/src/main/resources/application-with-dapr.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/greeting/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/greeting/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-dapr/pom.xml (90%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-compose-scale.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-compose.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-message-server/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-message-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerMessageController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-message-server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-product-server/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-product-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerProductController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/docker-product-server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-docker/pom.xml (92%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client-profiles/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/controller/HelloWorldController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application-dev.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/Application.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/client/BooksClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/model/Book.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BookMocks.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BooksClientIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/EurekaContainerConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/LoadBalancerBooksClientIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/MockBookServiceConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/RibbonTestConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/ServiceDiscoveryBooksClientLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/WireMockConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-eureka-test.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-ribbon-test.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-test.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/payload/get-books-response.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/NoFeignClientController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/templates/greeting-view.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/pom.xml (98%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionAwsApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/StringReverseHandler.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/functions/Greeter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionApplicationUnitTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-functions/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/README-OAuth.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/baeldung-realm.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/pom.xml (99%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersGatewayApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/config/WebClientConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ChainRequestGatewayFilterFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/LoggingGatewayFilterFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyRequestGatewayFilterFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyResponseGatewayFilterFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/FirstPreLastPostGlobalFilter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalFiltersConfigurations.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalPreFilter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/routes/ServiceRouteConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/web/SecondServiceRestController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/ServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/web/ServiceRestController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/QuotesApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/domain/Quote.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/web/QuoteApi.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/server/ResourceServerGatewayApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/shared/KeycloakReactiveTokenInstrospector.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/routes/DynamicRewriteRoute.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/WebFilterGatewayApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/ModifyBodyRouteConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/RequestRateLimiterResolverConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/application-customroutes.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/application-nosecurity.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/application-oauth-client.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/application-resource-server.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/application-url-rewrite.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/application-webfilters.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/customfilters-global-application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/introduction-application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/quotes-application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/secondservice-application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/main/resources/service-application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/utils/LoggerListAppender.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/ServiceIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplicationLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/RedisWebFilterFactoriesLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/WebFilterFactoriesLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/postman/OAuth_Gateway.postman_collection.json (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-gateway/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/templates/greeting-view.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/pom.xml (91%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/src/main/resources/templates/greeting-view.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-producer/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-producer/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-producer/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/client-config.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/client-service-deployment.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/Application.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/RibbonConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/TravelAgencyService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/application.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/client-service/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/deployment-travel-client.sh (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/mongo-deployment.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/secret.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/Application.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/controller/TravelAgencyController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/model/TravelDeal.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/repository/TravelDealRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback-spring.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/travel-agency-deployment.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/java/com/baeldung/spring/cloud/kubernetes/backend/KubernetesBackendApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/java/com/baeldung/spring/cloud/kubernetes/frontend/KubernetesFrontendApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/backend-deployment.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/frontend-deployment.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/Application.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/health/CustomHealthIndicator.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/liveness-example-k8s-template.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/readiness-example-k8s-template.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/Dockerfile (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/Application.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/health/CustomHealthIndicator.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/resources/logback-test.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-kubernetes/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw.cmd (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw.cmd (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/ExampleApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/client/JSONPlaceHolderClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/ClientConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/CustomErrorDecoder.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/BadRequestException.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/NotFoundException.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/hystrix/JSONPlaceHolderFallback.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/model/Post.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/JSONPlaceHolderService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/impl/JSONPlaceHolderServiceImpl.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-netflix-feign/src/test/java/com/baeldung/cloud/netflix/feign/NetflixFeignUnitTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/ServiceBrokerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/config/CatalogConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceBinding.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceInstance.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingServiceUnitTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceServiceUnitTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/ExampleApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/JSONPlaceHolderClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/PaymentClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/UserClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/ClientConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/CustomErrorDecoder.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/FeignConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/PaymentController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/BadRequestException.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/NotFoundException.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/ExceptionMessage.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/controller/FileController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/hystrix/JSONPlaceHolderFallback.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Payment.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Post.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuth2WebSecurityConfigurerAdapter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthClientCredentialsFeignManager.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthFeignConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/JSONPlaceHolderService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/impl/JSONPlaceHolderServiceImpl.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/main/resources/fileupload.txt (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignFileUploadLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignManualTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignOAuth2ManualTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/application-config/discovery.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/application-config/resource.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/BooksApiApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/SessionConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/dao/BookRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/model/Book.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/BooksApiIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/RestApiLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SessionLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/com/baeldung/SpringCloudRestConfigApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SessionConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SpringCloudRestServerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringCloudRestServerIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/BookReviewsApiApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/SessionConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/dao/BookReviewRepository.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/model/BookReview.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/BookReviewsApiIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/RestApiLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/pom.xml (94%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RestTemplateConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RibbonConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationAppIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/TestConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonClientApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialBackoffRetryFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialRandomBackoffRetryFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/FixedBackoffRetryFactory.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/RibbonConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/WeatherClientRibbonConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/controller/RibbonClientController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetryFailureManualTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetrySuccessManualTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-weather-service/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonWeatherServiceApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/WeatherController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/alias.rtf (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/main/java/com/baeldung/CloudSite.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/main/java/com/baeldung/config/SiteSecurityConfigurer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/main/java/com/baeldung/controller/CloudSiteController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/main/java/com/baeldung/filters/SimpleFilter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/main/resources/templates/personinfo.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-client/src/test/java/com/baeldung/example/springoath2/Springoath2ApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/main/java/com/baeldung/Application.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/main/java/com/baeldung/config/ResourceConfigurer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/PersonInfoController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/ResourceController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/main/java/com/baeldung/model/Person.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/java/com/baeldung/AuthServer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/AuthServerConfigurer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebMvcConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebSecurityConfigurer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/resources/certificate/mykeystore.jks (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/main/resources/templates/login.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/auth-server/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/mykeystore.jks (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/pom.xml (95%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-security/pubkey.txt (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-sentinel/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-sentinel/pom.xml (95%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/SentinelApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/config/SentinelAspectConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/controller/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/service/GreetingService.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/bash/hadoop.sh (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/hdfs/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/hdfs/hdfs.sh (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitter/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitter/twitter.sh (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/aggregate/AggregateApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/processor/ProcessorApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/sink/SinkApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/source/SourceApp.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/AvroKafkaApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/config/SchemRegistryConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/consumer/AvroConsumer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/controller/AvroController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/producer/AvroProducer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/application.yaml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-key-schema.avsc (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-schema.avsc (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kinesis/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/java/com/baeldung/KinesisApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/java/com/baeldung/KinesisApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/messages/TextPlainMessageConverter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/model/LogMessage.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/processor/MyProcessor.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/pom.xml (96%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/HelloWorldTaskConfigurer.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/JobConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskDemo.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskListener.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtaskbatch/src/test/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/src/main/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/TaskSinkConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/database-setup.sql (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/pom.xml (97%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/sample-policy.hcl (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountRepo.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountResource.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/SecretResource.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/domain/Account.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/main/resources/vault.jks (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/test/resources/bootstrap.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/test/resources/vault.jks (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/test/vault-config/localhost.cert (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/test/vault-config/localhost.key (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/src/test/vault-config/vault-test.hcl (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/vault-cheatsheet.txt (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/vault-env.bat (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/vault-env.sh (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/vault-start.bat (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/vault-start.sh (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/vault-unseal.bat (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-vault/vault-unseal.sh (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/src/main/resources/templates/greeting-view.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/Greeting/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/HelloWorld/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/HelloWorld/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/HelloWorld/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zookeeper/pom.xml (90%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java (100%) rename {spring-cloud/spring-cloud-zuul-eureka-integration/bin => spring-cloud-modules/spring-cloud-zuul-eureka-integration}/eureka-server/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/pom.xml (94%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/zuul-server/src/main/java/com/baeldung/spring/cloud/zuul/config/ZuulConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/api-gateway/src/test/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/pom.xml (93%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/weather-service/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/pom.xml (97%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerWebConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/controller/FooController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/dto/Foo.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-post-filter/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-post-filter/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/ZuulPostFilterApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/controllers/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/filters/ResponseLogFilter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-post-filter/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-post-filter/src/test/java/com/baeldung/ZuulPostFilterLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerIntegrationTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/application.properties (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/README.md (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/pom.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/CustomZuulFilter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiWebConfig.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorApplication.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilter.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/ZuulConfiguration.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/resources/application.yml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/resources/logback.xml (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/resources/templates/index.html (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/main/webapp/resources/angular-utf8-base64.min.js (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilterLiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/web/LiveTest.java (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/test/resources/.gitignore (100%) rename {spring-cloud => spring-cloud-modules}/spring-cloud-zuul/spring-zuul-ui/src/test/resources/persistence-mysql.properties (100%) delete mode 100644 spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/pom.xml delete mode 100644 spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/src/main/resources/application.yml delete mode 100644 spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/pom.xml delete mode 100644 spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml delete mode 100644 spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/pom.xml delete mode 100644 spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/src/main/resources/application.properties delete mode 100644 spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml diff --git a/pom.xml b/pom.xml index e9942d77e8..9fa62d27ee 100644 --- a/pom.xml +++ b/pom.xml @@ -616,7 +616,7 @@ spring-caching spring-caching-2 - spring-cloud + spring-cloud-modules spring-cloud-bus spring-cloud-data-flow @@ -1072,7 +1072,7 @@ spring-caching spring-caching-2 - spring-cloud + spring-cloud-modules spring-cloud-bus spring-cloud-data-flow diff --git a/spring-cloud/README.md b/spring-cloud-modules/README.md similarity index 100% rename from spring-cloud/README.md rename to spring-cloud-modules/README.md diff --git a/spring-cloud/pom.xml b/spring-cloud-modules/pom.xml similarity index 97% rename from spring-cloud/pom.xml rename to spring-cloud-modules/pom.xml index f58e1aec5c..d2f3845922 100644 --- a/spring-cloud/pom.xml +++ b/spring-cloud-modules/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT - spring-cloud + spring-cloud-modules pom diff --git a/spring-cloud/spring-cloud-archaius/README.md b/spring-cloud-modules/spring-cloud-archaius/README.md similarity index 100% rename from spring-cloud/spring-cloud-archaius/README.md rename to spring-cloud-modules/spring-cloud-archaius/README.md diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/pom.xml b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/pom.xml rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/pom.xml diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/AdditionalSourcesSimpleApplication.java b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/AdditionalSourcesSimpleApplication.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/AdditionalSourcesSimpleApplication.java rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/AdditionalSourcesSimpleApplication.java diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/config/ApplicationPropertiesConfigurations.java b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/config/ApplicationPropertiesConfigurations.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/config/ApplicationPropertiesConfigurations.java rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/config/ApplicationPropertiesConfigurations.java diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/controller/ConfigPropertiesController.java b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/controller/ConfigPropertiesController.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/controller/ConfigPropertiesController.java rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/java/com/baeldung/spring/cloud/archaius/additionalsources/controller/ConfigPropertiesController.java diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/config.properties b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/resources/config.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/config.properties rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/resources/config.properties diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/other-config.properties b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/resources/other-config.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/main/resources/other-config.properties rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/main/resources/other-config.properties diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/ArchaiusAdditionalSourcesLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/ArchaiusAdditionalSourcesLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/ArchaiusAdditionalSourcesLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/ArchaiusAdditionalSourcesLiveTest.java diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextTest.java b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-archaius/additional-sources-simple/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-archaius/basic-config/pom.xml b/spring-cloud-modules/spring-cloud-archaius/basic-config/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/pom.xml rename to spring-cloud-modules/spring-cloud-archaius/basic-config/pom.xml diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/BasicArchaiusApplication.java b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/BasicArchaiusApplication.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/BasicArchaiusApplication.java rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/BasicArchaiusApplication.java diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/controller/ConfigPropertiesController.java b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/controller/ConfigPropertiesController.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/controller/ConfigPropertiesController.java rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/java/com/baeldung/spring/cloud/archaius/basic/controller/ConfigPropertiesController.java diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/config.properties b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/resources/config.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/config.properties rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/resources/config.properties diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/other.properties b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/resources/other.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/main/resources/other.properties rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/main/resources/other.properties diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationIntegrationTest.java b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/ArchaiusBasicConfigurationLiveTest.java diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextTest.java b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/resources/config.properties b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/resources/config.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/test/resources/config.properties rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/resources/config.properties diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/basic-config/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-archaius/basic-config/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/pom.xml b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/pom.xml rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/pom.xml diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/DynamoSourcesApplication.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/DynamoSourcesApplication.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/DynamoSourcesApplication.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/DynamoSourcesApplication.java diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/ApplicationPropertiesConfigurations.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/ApplicationPropertiesConfigurations.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/ApplicationPropertiesConfigurations.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/ApplicationPropertiesConfigurations.java diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/DynamoDbConfiguration.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/DynamoDbConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/DynamoDbConfiguration.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/config/DynamoDbConfiguration.java diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/controller/ConfigPropertiesController.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/controller/ConfigPropertiesController.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/controller/ConfigPropertiesController.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/controller/ConfigPropertiesController.java diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusProperties.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusProperties.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusProperties.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusProperties.java diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusPropertiesRepository.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusPropertiesRepository.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusPropertiesRepository.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/java/com/baeldung/spring/cloud/archaius/dynamosources/dynamodb/ArchaiusPropertiesRepository.java diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/ArchaiusDynamoDbLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/ArchaiusDynamoDbLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/ArchaiusDynamoDbLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/ArchaiusDynamoDbLiveTest.java diff --git a/spring-cloud/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/dynamodb-config/src/test/java/com/baeldung/spring/cloud/archaius/dynamosources/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/pom.xml b/spring-cloud-modules/spring-cloud-archaius/extra-configs/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/pom.xml rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/pom.xml diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/ExtraConfigsApplication.java b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/ExtraConfigsApplication.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/ExtraConfigsApplication.java rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/ExtraConfigsApplication.java diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/controllers/ConfigPropertiesController.java b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/controllers/ConfigPropertiesController.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/controllers/ConfigPropertiesController.java rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/java/com/baeldung/spring/cloud/archaius/extraconfigs/controllers/ConfigPropertiesController.java diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/other-config-dir/extra.properties b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/resources/other-config-dir/extra.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/other-config-dir/extra.properties rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/resources/other-config-dir/extra.properties diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/other.properties b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/resources/other.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/main/resources/other.properties rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/main/resources/other.properties diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/spring/cloud/archaius/extraconfigs/ArchaiusExtraConfigsLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/spring/cloud/archaius/extraconfigs/ArchaiusExtraConfigsLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/spring/cloud/archaius/extraconfigs/ArchaiusExtraConfigsLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/test/java/com/baeldung/spring/cloud/archaius/extraconfigs/ArchaiusExtraConfigsLiveTest.java diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-archaius/extra-configs/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/extra-configs/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-archaius/extra-configs/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/pom.xml b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/pom.xml rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/pom.xml diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/JdbcSourcesApplication.java b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/JdbcSourcesApplication.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/JdbcSourcesApplication.java rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/JdbcSourcesApplication.java diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/config/ApplicationPropertiesConfigurations.java b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/config/ApplicationPropertiesConfigurations.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/config/ApplicationPropertiesConfigurations.java rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/config/ApplicationPropertiesConfigurations.java diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/controller/ConfigPropertiesController.java b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/controller/ConfigPropertiesController.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/controller/ConfigPropertiesController.java rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/controller/ConfigPropertiesController.java diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/jdbc/Properties.java b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/jdbc/Properties.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/jdbc/Properties.java rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/java/com/baeldung/spring/cloud/archaius/jdbconfig/jdbc/Properties.java diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/data.sql b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/resources/data.sql similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/main/resources/data.sql rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/main/resources/data.sql diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/ArchaiusJDBCSourceLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/ArchaiusJDBCSourceLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/ArchaiusJDBCSourceLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/ArchaiusJDBCSourceLiveTest.java diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextTest.java b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/jdbc-config/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-archaius/jdbc-config/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-archaius/pom.xml b/spring-cloud-modules/spring-cloud-archaius/pom.xml similarity index 97% rename from spring-cloud/spring-cloud-archaius/pom.xml rename to spring-cloud-modules/spring-cloud-archaius/pom.xml index 058f383ec0..1208daaba6 100644 --- a/spring-cloud/spring-cloud-archaius/pom.xml +++ b/spring-cloud-modules/spring-cloud-archaius/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/pom.xml b/spring-cloud-modules/spring-cloud-archaius/zookeeper-config/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-archaius/zookeeper-config/pom.xml rename to spring-cloud-modules/spring-cloud-archaius/zookeeper-config/pom.xml diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ZookeeperConfigApplication.java b/spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ZookeeperConfigApplication.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ZookeeperConfigApplication.java rename to spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ZookeeperConfigApplication.java diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/config/ZookeeperConfigsInitializer.java b/spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/config/ZookeeperConfigsInitializer.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/config/ZookeeperConfigsInitializer.java rename to spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/config/ZookeeperConfigsInitializer.java diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/controller/ConfigPropertiesController.java b/spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/controller/ConfigPropertiesController.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/controller/ConfigPropertiesController.java rename to spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/controller/ConfigPropertiesController.java diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-archaius/zookeeper-config/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ArchaiusZookeeperLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ArchaiusZookeeperLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ArchaiusZookeeperLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/ArchaiusZookeeperLiveTest.java diff --git a/spring-cloud/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-archaius/zookeeper-config/src/test/java/com/baeldung/spring/cloud/archaius/zookeeperconfig/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-aws/README.md b/spring-cloud-modules/spring-cloud-aws/README.md similarity index 100% rename from spring-cloud/spring-cloud-aws/README.md rename to spring-cloud-modules/spring-cloud-aws/README.md diff --git a/spring-cloud/spring-cloud-aws/pom.xml b/spring-cloud-modules/spring-cloud-aws/pom.xml similarity index 98% rename from spring-cloud/spring-cloud-aws/pom.xml rename to spring-cloud-modules/spring-cloud-aws/pom.xml index 312e800874..7c32bf5de5 100644 --- a/spring-cloud/spring-cloud-aws/pom.xml +++ b/spring-cloud-modules/spring-cloud-aws/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/InstanceProfileAwsApplication.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/InstanceProfileAwsApplication.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/InstanceProfileAwsApplication.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/InstanceProfileAwsApplication.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/SpringCloudAwsApplication.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/config/SpringCloudAwsConfig.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/config/SpringCloudAwsConfig.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/config/SpringCloudAwsConfig.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/config/SpringCloudAwsConfig.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2EnableMetadata.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2EnableMetadata.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2EnableMetadata.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2EnableMetadata.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2Metadata.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2Metadata.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2Metadata.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/ec2/EC2Metadata.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3Service.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3Service.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3Service.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3Service.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointController.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointController.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointController.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointController.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSMessageSender.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSMessageSender.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSMessageSender.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sns/SNSMessageSender.java diff --git a/spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQS.java b/spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQS.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQS.java rename to spring-cloud-modules/spring-cloud-aws/src/main/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQS.java diff --git a/spring-cloud/spring-cloud-aws/src/main/resources/InstanceProfileFormation.yaml b/spring-cloud-modules/spring-cloud-aws/src/main/resources/InstanceProfileFormation.yaml similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/resources/InstanceProfileFormation.yaml rename to spring-cloud-modules/spring-cloud-aws/src/main/resources/InstanceProfileFormation.yaml diff --git a/spring-cloud/spring-cloud-aws/src/main/resources/application-instance-profile.properties b/spring-cloud-modules/spring-cloud-aws/src/main/resources/application-instance-profile.properties similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/resources/application-instance-profile.properties rename to spring-cloud-modules/spring-cloud-aws/src/main/resources/application-instance-profile.properties diff --git a/spring-cloud/spring-cloud-aws/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-aws/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-aws/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-aws/src/main/resources/aws-config.xml b/spring-cloud-modules/spring-cloud-aws/src/main/resources/aws-config.xml similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/resources/aws-config.xml rename to spring-cloud-modules/spring-cloud-aws/src/main/resources/aws-config.xml diff --git a/spring-cloud/spring-cloud-aws/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-aws/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-aws/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-aws/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringCloudAwsTestUtil.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringCloudAwsTestUtil.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringCloudAwsTestUtil.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringCloudAwsTestUtil.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/ec2/EC2MetadataLiveTest.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/ec2/EC2MetadataLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/ec2/EC2MetadataLiveTest.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/ec2/EC2MetadataLiveTest.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/rds/SpringCloudRDSLiveTest.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/rds/SpringCloudRDSLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/rds/SpringCloudRDSLiveTest.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/rds/SpringCloudRDSLiveTest.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3LiveTest.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3LiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3LiveTest.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/s3/SpringCloudS3LiveTest.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointControllerUnitTest.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointControllerUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointControllerUnitTest.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SNSEndpointControllerUnitTest.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SpringCloudSNSLiveTest.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SpringCloudSNSLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SpringCloudSNSLiveTest.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sns/SpringCloudSNSLiveTest.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/Greeting.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/Greeting.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/Greeting.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/Greeting.java diff --git a/spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQSLiveTest.java b/spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQSLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQSLiveTest.java rename to spring-cloud-modules/spring-cloud-aws/src/test/java/com/baeldung/spring/cloud/aws/sqs/SpringCloudSQSLiveTest.java diff --git a/spring-cloud/spring-cloud-aws/src/test/resources/application-test.properties b/spring-cloud-modules/spring-cloud-aws/src/test/resources/application-test.properties similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/resources/application-test.properties rename to spring-cloud-modules/spring-cloud-aws/src/test/resources/application-test.properties diff --git a/spring-cloud/spring-cloud-aws/src/test/resources/test-file-upload.txt b/spring-cloud-modules/spring-cloud-aws/src/test/resources/test-file-upload.txt similarity index 100% rename from spring-cloud/spring-cloud-aws/src/test/resources/test-file-upload.txt rename to spring-cloud-modules/spring-cloud-aws/src/test/resources/test-file-upload.txt diff --git a/spring-cloud/spring-cloud-bootstrap/README.md b/spring-cloud-modules/spring-cloud-bootstrap/README.md similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/README.md rename to spring-cloud-modules/spring-cloud-bootstrap/README.md diff --git a/spring-cloud/spring-cloud-bootstrap/application-config/book-service.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/book-service.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/application-config/book-service.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/book-service.properties diff --git a/spring-cloud/spring-cloud-bootstrap/application-config/discovery.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/discovery.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/application-config/discovery.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/discovery.properties diff --git a/spring-cloud/spring-cloud-bootstrap/application-config/gateway.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/gateway.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/application-config/gateway.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/gateway.properties diff --git a/spring-cloud/spring-cloud-bootstrap/application-config/rating-service.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/rating-service.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/application-config/rating-service.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/rating-service.properties diff --git a/spring-cloud/spring-cloud-bootstrap/application-config/zipkin.properties b/spring-cloud-modules/spring-cloud-bootstrap/application-config/zipkin.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/application-config/zipkin.properties rename to spring-cloud-modules/spring-cloud-bootstrap/application-config/zipkin.properties diff --git a/spring-cloud/spring-cloud-bootstrap/config/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/config/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/config/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/config/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/ConfigApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/config/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/config/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/config/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-bootstrap/config/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/config/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/config/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-bootstrap/config/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-bootstrap/config/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/config/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/config/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-bootstrap/customer-service/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/customer-service/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/Customer.java b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/Customer.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/Customer.java rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/Customer.java diff --git a/spring-cloud/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/java/com/baeldung/customerservice/CustomerService.java diff --git a/spring-cloud/spring-cloud-bootstrap/customer-service/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/customer-service/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-bootstrap/customer-service/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/customer-service/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/customer-service/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/discovery/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/discovery/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/DiscoveryApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SessionConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/discovery/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/discovery/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-bootstrap/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/discovery/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/gateway/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/.angular-cli.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.angular-cli.json similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/.angular-cli.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.angular-cli.json diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/.editorconfig b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.editorconfig similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/.editorconfig rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.editorconfig diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/.gitignore b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/.gitignore rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/.gitignore diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/README.md b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/README.md similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/README.md rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/README.md diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.e2e-spec.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.po.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.po.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.po.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/app.po.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/e2e/tsconfig.e2e.json diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/karma.conf.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/karma.conf.js similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/karma.conf.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/karma.conf.js diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/package.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/package.json similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/package.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/package.json diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/protractor.conf.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/protractor.conf.js similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/protractor.conf.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/protractor.conf.js diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.css similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.css diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.html diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.component.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/app.module.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.css diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.html diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-detail/book-detail.component.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.css diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.html diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/book/book-list/book-list.component.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/click-stop-propagation.directive.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/http.service.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/http.service.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/http.service.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/http.service.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/principal.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/principal.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/principal.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/principal.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.css similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.css diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.html similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.html diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/app/rating/rating.component.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/assets/.gitkeep b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/assets/.gitkeep similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/assets/.gitkeep rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/assets/.gitkeep diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.prod.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.prod.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.prod.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.prod.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/environments/environment.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/favicon.ico b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/favicon.ico similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/favicon.ico rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/favicon.ico diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/index.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/index.html similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/index.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/index.html diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/main.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/main.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/main.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/main.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/polyfills.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/polyfills.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/polyfills.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/polyfills.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/styles.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/styles.css similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/styles.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/styles.css diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/test.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/test.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/test.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/test.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.app.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.app.json similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.app.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.app.json diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.spec.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.spec.json similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.spec.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/tsconfig.spec.json diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/typings.d.ts b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/typings.d.ts similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/typings.d.ts rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/src/typings.d.ts diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/tsconfig.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/tsconfig.json similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/tsconfig.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/tsconfig.json diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/tslint.json b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/tslint.json similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/angular/ui/tslint.json rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/angular/ui/tslint.json diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/AuthenticationController.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/ErrorPageConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SecurityConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/SessionConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/Book.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/book/BooksClient.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/Rating.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/client/rating/RatingsClient.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/controller/CombinedController.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/filter/SessionSavingZuulPreFilter.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/css/wro.css b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/css/wro.css similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/css/wro.css rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/css/wro.css diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.eot diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.svg diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.ttf diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/montserrat-webfont.woff diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.eot diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.svg diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.ttf diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/fonts/varela_round-webfont.woff diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/404-icon.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/404-icon.png similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/404-icon.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/404-icon.png diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/homepage-bg.jpg diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-bg.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-bg.png similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-bg.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-bg.png diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/platform-spring-xd.png diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka-mobile.png diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/images/spring-logo-eureka.png diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/js/wro.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/js/wro.js similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/js/wro.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/eureka/js/wro.js diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/favicon.ico b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/favicon.ico similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/favicon.ico rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/favicon.ico diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/index.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/index.html similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/index.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/index.html diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js.map b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js.map similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js.map rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/inline.bundle.js.map diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js.map b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js.map similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js.map rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/main.bundle.js.map diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js.map b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js.map similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js.map rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/polyfills.bundle.js.map diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js.map b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js.map similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js.map rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/home/styles.bundle.js.map diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/index.html b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/index.html similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/static/index.html rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/main/resources/static/index.html diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/LiveTest.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/java/com/baeldung/spring/cloud/bootstrap/gateway/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/test/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/gateway/src/test/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/gateway/src/test/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-client/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-client/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClient.java diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderClientImpl.java diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderDTO.java diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/java/com/baeldung/orderservice/client/OrderResponse.java diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-client/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-client/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-server/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-server/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/Order.java diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/java/com/baeldung/orderservice/OrderService.java diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/order-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/order-server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-bootstrap/order-service/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/order-service/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/order-service/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/order-service/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/pom.xml similarity index 93% rename from spring-cloud/spring-cloud-bootstrap/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/pom.xml index deba342d69..1e97082db1 100644 --- a/spring-cloud/spring-cloud-bootstrap/pom.xml +++ b/spring-cloud-modules/spring-cloud-bootstrap/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/BookServiceApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/DataLoader.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SecurityConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/SessionConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/Book.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookNotFoundException.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookRepository.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/test/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/test/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-book/src/test/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/svc-book/src/test/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/DataLoader.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/RatingServiceApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SecurityConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/SessionConfig.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/Rating.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingCacheRepository.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingNotFoundException.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingRepository.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/test/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/test/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/svc-rating/src/test/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/svc-rating/src/test/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/zipkin/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/zipkin/pom.xml rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/pom.xml diff --git a/spring-cloud/spring-cloud-bootstrap/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/java/com/baeldung/spring/cloud/bootstrap/zipkin/ZipkinApplication.java diff --git a/spring-cloud/spring-cloud-bootstrap/zipkin/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/zipkin/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-bootstrap/zipkin/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/zipkin/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-bootstrap/zipkin/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-bootstrap/zipkin/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-bootstrap/zipkin/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-circuit-breaker/README.md b/spring-cloud-modules/spring-cloud-circuit-breaker/README.md similarity index 100% rename from spring-cloud/spring-cloud-circuit-breaker/README.md rename to spring-cloud-modules/spring-cloud-circuit-breaker/README.md diff --git a/spring-cloud/spring-cloud-circuit-breaker/pom.xml b/spring-cloud-modules/spring-cloud-circuit-breaker/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-circuit-breaker/pom.xml rename to spring-cloud-modules/spring-cloud-circuit-breaker/pom.xml index 0b0dafee46..3fe060c0b6 100644 --- a/spring-cloud/spring-cloud-circuit-breaker/pom.xml +++ b/spring-cloud-modules/spring-cloud-circuit-breaker/pom.xml @@ -9,7 +9,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/AlbumService.java b/spring-cloud-modules/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/AlbumService.java similarity index 100% rename from spring-cloud/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/AlbumService.java rename to spring-cloud-modules/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/AlbumService.java diff --git a/spring-cloud/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/Controller.java b/spring-cloud-modules/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/Controller.java similarity index 100% rename from spring-cloud/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/Controller.java rename to spring-cloud-modules/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/Controller.java diff --git a/spring-cloud/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/SpringApp.java b/spring-cloud-modules/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/SpringApp.java similarity index 100% rename from spring-cloud/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/SpringApp.java rename to spring-cloud-modules/spring-cloud-circuit-breaker/src/main/java/com/baeldung/circuitbreaker/SpringApp.java diff --git a/spring-cloud/spring-cloud-circuit-breaker/src/main/resources/fallback-album-list.json b/spring-cloud-modules/spring-cloud-circuit-breaker/src/main/resources/fallback-album-list.json similarity index 100% rename from spring-cloud/spring-cloud-circuit-breaker/src/main/resources/fallback-album-list.json rename to spring-cloud-modules/spring-cloud-circuit-breaker/src/main/resources/fallback-album-list.json diff --git a/spring-cloud/spring-cloud-config/README.md b/spring-cloud-modules/spring-cloud-config/README.md similarity index 100% rename from spring-cloud/spring-cloud-config/README.md rename to spring-cloud-modules/spring-cloud-config/README.md diff --git a/spring-cloud/spring-cloud-config/client/pom.xml b/spring-cloud-modules/spring-cloud-config/client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-config/client/pom.xml rename to spring-cloud-modules/spring-cloud-config/client/pom.xml diff --git a/spring-cloud/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java b/spring-cloud-modules/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java similarity index 100% rename from spring-cloud/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java rename to spring-cloud-modules/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java diff --git a/spring-cloud/spring-cloud-config/client/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-config/client/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-config/client/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-config/client/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-config/client/src/test/java/com/baeldung/spring/cloud/config/client/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-config/config-repo/config-client-development.properties b/spring-cloud-modules/spring-cloud-config/config-repo/config-client-development.properties similarity index 100% rename from spring-cloud/spring-cloud-config/config-repo/config-client-development.properties rename to spring-cloud-modules/spring-cloud-config/config-repo/config-client-development.properties diff --git a/spring-cloud/spring-cloud-config/config-repo/config-client-production.properties b/spring-cloud-modules/spring-cloud-config/config-repo/config-client-production.properties similarity index 100% rename from spring-cloud/spring-cloud-config/config-repo/config-client-production.properties rename to spring-cloud-modules/spring-cloud-config/config-repo/config-client-production.properties diff --git a/spring-cloud/spring-cloud-config/pom.xml b/spring-cloud-modules/spring-cloud-config/pom.xml similarity index 95% rename from spring-cloud/spring-cloud-config/pom.xml rename to spring-cloud-modules/spring-cloud-config/pom.xml index 1c8ada8a65..09be8ae1b8 100644 --- a/spring-cloud/spring-cloud-config/pom.xml +++ b/spring-cloud-modules/spring-cloud-config/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-config/server/pom.xml b/spring-cloud-modules/spring-cloud-config/server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-config/server/pom.xml rename to spring-cloud-modules/spring-cloud-config/server/pom.xml diff --git a/spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java b/spring-cloud-modules/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java similarity index 100% rename from spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java rename to spring-cloud-modules/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/ConfigServer.java diff --git a/spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java b/spring-cloud-modules/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java rename to spring-cloud-modules/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java diff --git a/spring-cloud/spring-cloud-config/server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-config/server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-config/server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-config/server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-config/server/src/main/resources/config-server.jks b/spring-cloud-modules/spring-cloud-config/server/src/main/resources/config-server.jks similarity index 100% rename from spring-cloud/spring-cloud-config/server/src/main/resources/config-server.jks rename to spring-cloud-modules/spring-cloud-config/server/src/main/resources/config-server.jks diff --git a/spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java b/spring-cloud-modules/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-config/server/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-config/server/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-config/server/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-config/server/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-connectors-heroku/README.md b/spring-cloud-modules/spring-cloud-connectors-heroku/README.md similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/README.md rename to spring-cloud-modules/spring-cloud-connectors-heroku/README.md diff --git a/spring-cloud/spring-cloud-connectors-heroku/pom.xml b/spring-cloud-modules/spring-cloud-connectors-heroku/pom.xml similarity index 97% rename from spring-cloud/spring-cloud-connectors-heroku/pom.xml rename to spring-cloud-modules/spring-cloud-connectors-heroku/pom.xml index b38ede6d89..88e60f5ce8 100644 --- a/spring-cloud/spring-cloud-connectors-heroku/pom.xml +++ b/spring-cloud-modules/spring-cloud-connectors-heroku/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/ConnectorsHerokuApplication.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/ConnectorsHerokuApplication.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/ConnectorsHerokuApplication.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/ConnectorsHerokuApplication.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/Book.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/Book.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/Book.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/Book.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookController.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookController.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookController.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookController.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookRepository.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookRepository.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookRepository.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookRepository.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookService.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookService.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookService.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/book/BookService.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/Product.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/Product.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/Product.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/Product.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductController.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductController.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductController.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductController.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductRepository.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductRepository.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductRepository.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductRepository.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductService.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductService.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductService.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/java/com/baeldung/spring/cloud/connectors/heroku/product/ProductService.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-connectors-heroku/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextTest.java b/spring-cloud-modules/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-connectors-heroku/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-connectors-heroku/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-connectors-heroku/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-consul/README.md b/spring-cloud-modules/spring-cloud-consul/README.md similarity index 100% rename from spring-cloud/spring-cloud-consul/README.md rename to spring-cloud-modules/spring-cloud-consul/README.md diff --git a/spring-cloud/spring-cloud-consul/pom.xml b/spring-cloud-modules/spring-cloud-consul/pom.xml similarity index 97% rename from spring-cloud/spring-cloud-consul/pom.xml rename to spring-cloud-modules/spring-cloud-consul/pom.xml index f21550e360..52da6ff763 100644 --- a/spring-cloud/spring-cloud-consul/pom.xml +++ b/spring-cloud-modules/spring-cloud-consul/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientApplication.java diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientController.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientController.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientController.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/discovery/DiscoveryClientController.java diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryApplication.java diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryController.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryController.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryController.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/health/ServiceDiscoveryController.java diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/leadership/LeadershipElection.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/leadership/LeadershipElection.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/leadership/LeadershipElection.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/leadership/LeadershipElection.java diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesApplication.java diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesController.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesController.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesController.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/DistributedPropertiesController.java diff --git a/spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/MyProperties.java b/spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/MyProperties.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/MyProperties.java rename to spring-cloud-modules/spring-cloud-consul/src/main/java/com/baeldung/spring/cloud/consul/properties/MyProperties.java diff --git a/spring-cloud/spring-cloud-consul/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-consul/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-consul/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-consul/src/main/resources/bootstrap.yml b/spring-cloud-modules/spring-cloud-consul/src/main/resources/bootstrap.yml similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/resources/bootstrap.yml rename to spring-cloud-modules/spring-cloud-consul/src/main/resources/bootstrap.yml diff --git a/spring-cloud/spring-cloud-consul/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-consul/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-consul/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-consul/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-consul/src/test/java/com/baeldung/spring/cloud/consul/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-consul/src/test/java/com/baeldung/spring/cloud/consul/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-consul/src/test/java/com/baeldung/spring/cloud/consul/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-consul/src/test/java/com/baeldung/spring/cloud/consul/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-contract/README.md b/spring-cloud-modules/spring-cloud-contract/README.md similarity index 100% rename from spring-cloud/spring-cloud-contract/README.md rename to spring-cloud-modules/spring-cloud-contract/README.md diff --git a/spring-cloud/spring-cloud-contract/pom.xml b/spring-cloud-modules/spring-cloud-contract/pom.xml similarity index 97% rename from spring-cloud/spring-cloud-contract/pom.xml rename to spring-cloud-modules/spring-cloud-contract/pom.xml index 6e8b130ed1..bfbac19a81 100644 --- a/spring-cloud/spring-cloud-contract/pom.xml +++ b/spring-cloud-modules/spring-cloud-contract/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/pom.xml diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/SpringCloudContractConsumerApplication.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/SpringCloudContractConsumerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/SpringCloudContractConsumerApplication.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/SpringCloudContractConsumerApplication.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathController.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathController.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathController.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathController.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathControllerIntegrationTest.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathControllerIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathControllerIntegrationTest.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/com/baeldung/spring/cloud/springcloudcontractconsumer/controller/BasicMathControllerIntegrationTest.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/pom.xml rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/pom.xml diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/SpringCloudContractProducerApplication.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/SpringCloudContractProducerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/SpringCloudContractProducerApplication.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/SpringCloudContractProducerApplication.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/controller/EvenOddController.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/controller/EvenOddController.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/controller/EvenOddController.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/java/com/baeldung/spring/cloud/springcloudcontractproducer/controller/EvenOddController.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/spring/cloud/springcloudcontractproducer/BaseTestClass.java b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/spring/cloud/springcloudcontractproducer/BaseTestClass.java similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/spring/cloud/springcloudcontractproducer/BaseTestClass.java rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/com/baeldung/spring/cloud/springcloudcontractproducer/BaseTestClass.java diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnEvenWhenRequestParamIsEven.groovy b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnEvenWhenRequestParamIsEven.groovy similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnEvenWhenRequestParamIsEven.groovy rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnEvenWhenRequestParamIsEven.groovy diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnOddWhenRequestParamIsOdd.groovy b/spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnOddWhenRequestParamIsOdd.groovy similarity index 100% rename from spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnOddWhenRequestParamIsOdd.groovy rename to spring-cloud-modules/spring-cloud-contract/spring-cloud-contract-producer/src/test/resources/contracts/shouldReturnOddWhenRequestParamIsOdd.groovy diff --git a/spring-cloud/spring-cloud-dapr/README.md b/spring-cloud-modules/spring-cloud-dapr/README.md similarity index 100% rename from spring-cloud/spring-cloud-dapr/README.md rename to spring-cloud-modules/spring-cloud-dapr/README.md diff --git a/spring-cloud/spring-cloud-dapr/dapr-config/basic-config.yaml b/spring-cloud-modules/spring-cloud-dapr/dapr-config/basic-config.yaml similarity index 100% rename from spring-cloud/spring-cloud-dapr/dapr-config/basic-config.yaml rename to spring-cloud-modules/spring-cloud-dapr/dapr-config/basic-config.yaml diff --git a/spring-cloud/spring-cloud-dapr/dapr-config/consul-config.yaml b/spring-cloud-modules/spring-cloud-dapr/dapr-config/consul-config.yaml similarity index 100% rename from spring-cloud/spring-cloud-dapr/dapr-config/consul-config.yaml rename to spring-cloud-modules/spring-cloud-dapr/dapr-config/consul-config.yaml diff --git a/spring-cloud/spring-cloud-dapr/dapr-config/consul-zipkin-config.yaml b/spring-cloud-modules/spring-cloud-dapr/dapr-config/consul-zipkin-config.yaml similarity index 100% rename from spring-cloud/spring-cloud-dapr/dapr-config/consul-zipkin-config.yaml rename to spring-cloud-modules/spring-cloud-dapr/dapr-config/consul-zipkin-config.yaml diff --git a/spring-cloud/spring-cloud-dapr/gateway/pom.xml b/spring-cloud-modules/spring-cloud-dapr/gateway/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-dapr/gateway/pom.xml rename to spring-cloud-modules/spring-cloud-dapr/gateway/pom.xml diff --git a/spring-cloud/spring-cloud-dapr/gateway/src/main/java/com/baeldung/gateway/GatewayApp.java b/spring-cloud-modules/spring-cloud-dapr/gateway/src/main/java/com/baeldung/gateway/GatewayApp.java similarity index 100% rename from spring-cloud/spring-cloud-dapr/gateway/src/main/java/com/baeldung/gateway/GatewayApp.java rename to spring-cloud-modules/spring-cloud-dapr/gateway/src/main/java/com/baeldung/gateway/GatewayApp.java diff --git a/spring-cloud/spring-cloud-dapr/gateway/src/main/resources/application-no-dapr.yml b/spring-cloud-modules/spring-cloud-dapr/gateway/src/main/resources/application-no-dapr.yml similarity index 100% rename from spring-cloud/spring-cloud-dapr/gateway/src/main/resources/application-no-dapr.yml rename to spring-cloud-modules/spring-cloud-dapr/gateway/src/main/resources/application-no-dapr.yml diff --git a/spring-cloud/spring-cloud-dapr/gateway/src/main/resources/application-with-dapr.yml b/spring-cloud-modules/spring-cloud-dapr/gateway/src/main/resources/application-with-dapr.yml similarity index 100% rename from spring-cloud/spring-cloud-dapr/gateway/src/main/resources/application-with-dapr.yml rename to spring-cloud-modules/spring-cloud-dapr/gateway/src/main/resources/application-with-dapr.yml diff --git a/spring-cloud/spring-cloud-dapr/greeting/pom.xml b/spring-cloud-modules/spring-cloud-dapr/greeting/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-dapr/greeting/pom.xml rename to spring-cloud-modules/spring-cloud-dapr/greeting/pom.xml diff --git a/spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingApp.java b/spring-cloud-modules/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingApp.java similarity index 100% rename from spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingApp.java rename to spring-cloud-modules/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingApp.java diff --git a/spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingController.java b/spring-cloud-modules/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingController.java rename to spring-cloud-modules/spring-cloud-dapr/greeting/src/main/java/com/baeldung/hello/GreetingController.java diff --git a/spring-cloud/spring-cloud-dapr/greeting/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-dapr/greeting/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-dapr/greeting/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-dapr/greeting/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-dapr/pom.xml b/spring-cloud-modules/spring-cloud-dapr/pom.xml similarity index 90% rename from spring-cloud/spring-cloud-dapr/pom.xml rename to spring-cloud-modules/spring-cloud-dapr/pom.xml index 436666b08e..24b6c989bd 100644 --- a/spring-cloud/spring-cloud-dapr/pom.xml +++ b/spring-cloud-modules/spring-cloud-dapr/pom.xml @@ -8,7 +8,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-docker/README.md b/spring-cloud-modules/spring-cloud-docker/README.md similarity index 100% rename from spring-cloud/spring-cloud-docker/README.md rename to spring-cloud-modules/spring-cloud-docker/README.md diff --git a/spring-cloud/spring-cloud-docker/docker-compose-scale.yml b/spring-cloud-modules/spring-cloud-docker/docker-compose-scale.yml similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-compose-scale.yml rename to spring-cloud-modules/spring-cloud-docker/docker-compose-scale.yml diff --git a/spring-cloud/spring-cloud-docker/docker-compose.yml b/spring-cloud-modules/spring-cloud-docker/docker-compose.yml similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-compose.yml rename to spring-cloud-modules/spring-cloud-docker/docker-compose.yml diff --git a/spring-cloud/spring-cloud-docker/docker-message-server/Dockerfile b/spring-cloud-modules/spring-cloud-docker/docker-message-server/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-message-server/Dockerfile rename to spring-cloud-modules/spring-cloud-docker/docker-message-server/Dockerfile diff --git a/spring-cloud/spring-cloud-docker/docker-message-server/pom.xml b/spring-cloud-modules/spring-cloud-docker/docker-message-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-message-server/pom.xml rename to spring-cloud-modules/spring-cloud-docker/docker-message-server/pom.xml diff --git a/spring-cloud/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerMessageController.java b/spring-cloud-modules/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerMessageController.java similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerMessageController.java rename to spring-cloud-modules/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerMessageController.java diff --git a/spring-cloud/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java b/spring-cloud-modules/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java rename to spring-cloud-modules/spring-cloud-docker/docker-message-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java diff --git a/spring-cloud/spring-cloud-docker/docker-message-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-docker/docker-message-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-message-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-docker/docker-message-server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-docker/docker-product-server/Dockerfile b/spring-cloud-modules/spring-cloud-docker/docker-product-server/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-product-server/Dockerfile rename to spring-cloud-modules/spring-cloud-docker/docker-product-server/Dockerfile diff --git a/spring-cloud/spring-cloud-docker/docker-product-server/pom.xml b/spring-cloud-modules/spring-cloud-docker/docker-product-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-product-server/pom.xml rename to spring-cloud-modules/spring-cloud-docker/docker-product-server/pom.xml diff --git a/spring-cloud/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerProductController.java b/spring-cloud-modules/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerProductController.java similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerProductController.java rename to spring-cloud-modules/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerProductController.java diff --git a/spring-cloud/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java b/spring-cloud-modules/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java rename to spring-cloud-modules/spring-cloud-docker/docker-product-server/src/main/java/com/baeldung/spring/cloud/config/docker/DockerServer.java diff --git a/spring-cloud/spring-cloud-docker/docker-product-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-docker/docker-product-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-docker/docker-product-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-docker/docker-product-server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-docker/pom.xml b/spring-cloud-modules/spring-cloud-docker/pom.xml similarity index 92% rename from spring-cloud/spring-cloud-docker/pom.xml rename to spring-cloud-modules/spring-cloud-docker/pom.xml index 735dae2ea7..4cc5f35bd9 100644 --- a/spring-cloud/spring-cloud-docker/pom.xml +++ b/spring-cloud-modules/spring-cloud-docker/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/README.md b/spring-cloud-modules/spring-cloud-eureka-self-preservation/README.md similarity index 100% rename from spring-cloud/spring-cloud-eureka-self-preservation/README.md rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/README.md diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/pom.xml b/spring-cloud-modules/spring-cloud-eureka-self-preservation/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-eureka-self-preservation/pom.xml rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/pom.xml index 5000adc164..9827c578a4 100644 --- a/spring-cloud/spring-cloud-eureka-self-preservation/pom.xml +++ b/spring-cloud-modules/spring-cloud-eureka-self-preservation/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/pom.xml b/spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/pom.xml rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/pom.xml diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java b/spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java similarity index 100% rename from spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-client/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/pom.xml b/spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/pom.xml rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/pom.xml diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java b/spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java diff --git a/spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-eureka-self-preservation/spring-cloud-eureka-server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-eureka/README.md b/spring-cloud-modules/spring-cloud-eureka/README.md similarity index 100% rename from spring-cloud/spring-cloud-eureka/README.md rename to spring-cloud-modules/spring-cloud-eureka/README.md diff --git a/spring-cloud/spring-cloud-eureka/pom.xml b/spring-cloud-modules/spring-cloud-eureka/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-eureka/pom.xml rename to spring-cloud-modules/spring-cloud-eureka/pom.xml index 63190f7f20..2a9c4f5fde 100644 --- a/spring-cloud/spring-cloud-eureka/pom.xml +++ b/spring-cloud-modules/spring-cloud-eureka/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/pom.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/pom.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/pom.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/controller/HelloWorldController.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/controller/HelloWorldController.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/controller/HelloWorldController.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/java/com/baeldung/spring/cloud/eureka/client/controller/HelloWorldController.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application-dev.properties b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application-dev.properties similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application-dev.properties rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application-dev.properties diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client-profiles/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/pom.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/pom.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/pom.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/pom.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/Application.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/Application.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/Application.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/Application.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/client/BooksClient.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/client/BooksClient.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/client/BooksClient.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/client/BooksClient.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/model/Book.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/model/Book.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/model/Book.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/main/java/com/baeldung/spring/cloud/model/Book.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BookMocks.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BookMocks.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BookMocks.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BookMocks.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BooksClientIntegrationTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BooksClientIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BooksClientIntegrationTest.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/BooksClientIntegrationTest.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/EurekaContainerConfig.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/EurekaContainerConfig.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/EurekaContainerConfig.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/EurekaContainerConfig.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/LoadBalancerBooksClientIntegrationTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/LoadBalancerBooksClientIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/LoadBalancerBooksClientIntegrationTest.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/LoadBalancerBooksClientIntegrationTest.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/MockBookServiceConfig.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/MockBookServiceConfig.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/MockBookServiceConfig.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/MockBookServiceConfig.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/RibbonTestConfig.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/RibbonTestConfig.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/RibbonTestConfig.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/RibbonTestConfig.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/ServiceDiscoveryBooksClientLiveTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/ServiceDiscoveryBooksClientLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/ServiceDiscoveryBooksClientLiveTest.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/ServiceDiscoveryBooksClientLiveTest.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/WireMockConfig.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/WireMockConfig.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/WireMockConfig.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/java/com/baeldung/spring/cloud/client/WireMockConfig.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-eureka-test.yml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-eureka-test.yml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-eureka-test.yml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-eureka-test.yml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-ribbon-test.yml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-ribbon-test.yml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-ribbon-test.yml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-ribbon-test.yml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-test.yml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-test.yml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-test.yml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/application-test.yml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/payload/get-books-response.json b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/payload/get-books-response.json similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/payload/get-books-response.json rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client-integration-test/src/test/resources/payload/get-books-response.json diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/pom.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/FeignClientApplication.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/GreetingClient.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/NoFeignClientController.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/NoFeignClientController.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/NoFeignClientController.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/java/com/baeldung/spring/cloud/feign/client/NoFeignClientController.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/templates/greeting-view.html b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/templates/greeting-view.html similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/templates/greeting-view.html rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/main/resources/templates/greeting-view.html diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/pom.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java b/spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-functions/README.md b/spring-cloud-modules/spring-cloud-functions/README.md similarity index 100% rename from spring-cloud/spring-cloud-functions/README.md rename to spring-cloud-modules/spring-cloud-functions/README.md diff --git a/spring-cloud/spring-cloud-functions/pom.xml b/spring-cloud-modules/spring-cloud-functions/pom.xml similarity index 98% rename from spring-cloud/spring-cloud-functions/pom.xml rename to spring-cloud-modules/spring-cloud-functions/pom.xml index d9f90c7a56..0b392daacf 100644 --- a/spring-cloud/spring-cloud-functions/pom.xml +++ b/spring-cloud-modules/spring-cloud-functions/pom.xml @@ -12,7 +12,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionAwsApplication.java b/spring-cloud-modules/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionAwsApplication.java similarity index 100% rename from spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionAwsApplication.java rename to spring-cloud-modules/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionAwsApplication.java diff --git a/spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/StringReverseHandler.java b/spring-cloud-modules/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/StringReverseHandler.java similarity index 100% rename from spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/StringReverseHandler.java rename to spring-cloud-modules/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/StringReverseHandler.java diff --git a/spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/functions/Greeter.java b/spring-cloud-modules/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/functions/Greeter.java similarity index 100% rename from spring-cloud/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/functions/Greeter.java rename to spring-cloud-modules/spring-cloud-functions/src/main/java/com/baeldung/spring/cloudfunction/aws/functions/Greeter.java diff --git a/spring-cloud/spring-cloud-functions/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-functions/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-functions/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-functions/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionApplicationUnitTest.java b/spring-cloud-modules/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionApplicationUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionApplicationUnitTest.java rename to spring-cloud-modules/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/CloudFunctionApplicationUnitTest.java diff --git a/spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextTest.java b/spring-cloud-modules/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-functions/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-functions/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-functions/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-functions/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-gateway/README-OAuth.md b/spring-cloud-modules/spring-cloud-gateway/README-OAuth.md similarity index 100% rename from spring-cloud/spring-cloud-gateway/README-OAuth.md rename to spring-cloud-modules/spring-cloud-gateway/README-OAuth.md diff --git a/spring-cloud/spring-cloud-gateway/README.md b/spring-cloud-modules/spring-cloud-gateway/README.md similarity index 100% rename from spring-cloud/spring-cloud-gateway/README.md rename to spring-cloud-modules/spring-cloud-gateway/README.md diff --git a/spring-cloud/spring-cloud-gateway/baeldung-realm.json b/spring-cloud-modules/spring-cloud-gateway/baeldung-realm.json similarity index 100% rename from spring-cloud/spring-cloud-gateway/baeldung-realm.json rename to spring-cloud-modules/spring-cloud-gateway/baeldung-realm.json diff --git a/spring-cloud/spring-cloud-gateway/pom.xml b/spring-cloud-modules/spring-cloud-gateway/pom.xml similarity index 99% rename from spring-cloud/spring-cloud-gateway/pom.xml rename to spring-cloud-modules/spring-cloud-gateway/pom.xml index e8949cc039..76072a59ac 100644 --- a/spring-cloud/spring-cloud-gateway/pom.xml +++ b/spring-cloud-modules/spring-cloud-gateway/pom.xml @@ -9,7 +9,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersGatewayApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersGatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersGatewayApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersGatewayApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/config/WebClientConfig.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/config/WebClientConfig.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/config/WebClientConfig.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/config/WebClientConfig.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ChainRequestGatewayFilterFactory.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ChainRequestGatewayFilterFactory.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ChainRequestGatewayFilterFactory.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ChainRequestGatewayFilterFactory.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/LoggingGatewayFilterFactory.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/LoggingGatewayFilterFactory.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/LoggingGatewayFilterFactory.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/LoggingGatewayFilterFactory.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyRequestGatewayFilterFactory.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyRequestGatewayFilterFactory.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyRequestGatewayFilterFactory.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyRequestGatewayFilterFactory.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyResponseGatewayFilterFactory.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyResponseGatewayFilterFactory.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyResponseGatewayFilterFactory.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/factories/ModifyResponseGatewayFilterFactory.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/FirstPreLastPostGlobalFilter.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/FirstPreLastPostGlobalFilter.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/FirstPreLastPostGlobalFilter.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/FirstPreLastPostGlobalFilter.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalFiltersConfigurations.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalFiltersConfigurations.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalFiltersConfigurations.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalFiltersConfigurations.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalPreFilter.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalPreFilter.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalPreFilter.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/filters/global/LoggingGlobalPreFilter.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/routes/ServiceRouteConfiguration.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/routes/ServiceRouteConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/routes/ServiceRouteConfiguration.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/routes/ServiceRouteConfiguration.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/web/SecondServiceRestController.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/web/SecondServiceRestController.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/web/SecondServiceRestController.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/secondservice/web/SecondServiceRestController.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/ServiceApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/ServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/ServiceApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/ServiceApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/web/ServiceRestController.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/web/ServiceRestController.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/web/ServiceRestController.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/service/web/ServiceRestController.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/config/CustomPredicatesConfig.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/factories/GoldenCustomerRoutePredicateFactory.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/custompredicates/service/GoldenCustomerService.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/introduction/IntroductionGatewayApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/QuotesApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/QuotesApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/QuotesApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/QuotesApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/domain/Quote.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/domain/Quote.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/domain/Quote.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/domain/Quote.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/web/QuoteApi.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/web/QuoteApi.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/web/QuoteApi.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/backend/web/QuoteApi.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/server/ResourceServerGatewayApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/server/ResourceServerGatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/server/ResourceServerGatewayApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/server/ResourceServerGatewayApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/shared/KeycloakReactiveTokenInstrospector.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/shared/KeycloakReactiveTokenInstrospector.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/shared/KeycloakReactiveTokenInstrospector.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/oauth/shared/KeycloakReactiveTokenInstrospector.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/routes/DynamicRewriteRoute.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/routes/DynamicRewriteRoute.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/routes/DynamicRewriteRoute.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/rewrite/routes/DynamicRewriteRoute.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/WebFilterGatewayApplication.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/WebFilterGatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/WebFilterGatewayApplication.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/WebFilterGatewayApplication.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/ModifyBodyRouteConfig.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/ModifyBodyRouteConfig.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/ModifyBodyRouteConfig.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/ModifyBodyRouteConfig.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/RequestRateLimiterResolverConfig.java b/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/RequestRateLimiterResolverConfig.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/RequestRateLimiterResolverConfig.java rename to spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/webfilters/config/RequestRateLimiterResolverConfig.java diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/application-customroutes.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-customroutes.yml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/application-customroutes.yml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-customroutes.yml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/application-nosecurity.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-nosecurity.yml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/application-nosecurity.yml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-nosecurity.yml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/application-oauth-client.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-oauth-client.yml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/application-oauth-client.yml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-oauth-client.yml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/application-resource-server.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-resource-server.yml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/application-resource-server.yml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-resource-server.yml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/application-url-rewrite.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-url-rewrite.yml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/application-url-rewrite.yml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-url-rewrite.yml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/application-webfilters.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-webfilters.yml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/application-webfilters.yml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/application-webfilters.yml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/customfilters-global-application.properties b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/customfilters-global-application.properties similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/customfilters-global-application.properties rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/customfilters-global-application.properties diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/introduction-application.properties b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/introduction-application.properties similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/introduction-application.properties rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/introduction-application.properties diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/quotes-application.properties b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/quotes-application.properties similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/quotes-application.properties rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/quotes-application.properties diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/secondservice-application.properties b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/secondservice-application.properties similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/secondservice-application.properties rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/secondservice-application.properties diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/service-application.properties b/spring-cloud-modules/spring-cloud-gateway/src/main/resources/service-application.properties similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/main/resources/service-application.properties rename to spring-cloud-modules/spring-cloud-gateway/src/main/resources/service-application.properties diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersLiveTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersLiveTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/CustomFiltersLiveTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/utils/LoggerListAppender.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/utils/LoggerListAppender.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/utils/LoggerListAppender.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/gatewayapp/utils/LoggerListAppender.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceIntegrationTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceIntegrationTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SecondServiceIntegrationTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SpringContextTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/secondservice/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/ServiceIntegrationTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/ServiceIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/ServiceIntegrationTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/ServiceIntegrationTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/SpringContextTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/service/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/custompredicates/CustomPredicatesApplicationLiveTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/introduction/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplicationLiveTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplicationLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplicationLiveTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/rewrite/URLRewriteGatewayApplicationLiveTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/RedisWebFilterFactoriesLiveTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/RedisWebFilterFactoriesLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/RedisWebFilterFactoriesLiveTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/RedisWebFilterFactoriesLiveTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/WebFilterFactoriesLiveTest.java b/spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/WebFilterFactoriesLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/WebFilterFactoriesLiveTest.java rename to spring-cloud-modules/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/webfilters/WebFilterFactoriesLiveTest.java diff --git a/spring-cloud/spring-cloud-gateway/src/test/postman/OAuth_Gateway.postman_collection.json b/spring-cloud-modules/spring-cloud-gateway/src/test/postman/OAuth_Gateway.postman_collection.json similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/postman/OAuth_Gateway.postman_collection.json rename to spring-cloud-modules/spring-cloud-gateway/src/test/postman/OAuth_Gateway.postman_collection.json diff --git a/spring-cloud/spring-cloud-gateway/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-gateway/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-gateway/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-gateway/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-hystrix/README.md b/spring-cloud-modules/spring-cloud-hystrix/README.md similarity index 100% rename from spring-cloud/spring-cloud-hystrix/README.md rename to spring-cloud-modules/spring-cloud-hystrix/README.md diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/pom.xml rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/pom.xml diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingClient.java diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerFeignApplication.java diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/templates/greeting-view.html b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/templates/greeting-view.html similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/templates/greeting-view.html rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/main/resources/templates/greeting-view.html diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java b/spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-hystrix/pom.xml b/spring-cloud-modules/spring-cloud-hystrix/pom.xml similarity index 91% rename from spring-cloud/spring-cloud-hystrix/pom.xml rename to spring-cloud-modules/spring-cloud-hystrix/pom.xml index 48216827c8..e1f30c25dc 100644 --- a/spring-cloud/spring-cloud-hystrix/pom.xml +++ b/spring-cloud-modules/spring-cloud-hystrix/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/pom.xml b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/pom.xml rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/pom.xml diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingController.java diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/GreetingService.java diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/consumer/RestConsumerApplication.java diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/resources/templates/greeting-view.html b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/templates/greeting-view.html similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/src/main/resources/templates/greeting-view.html rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/main/resources/templates/greeting-view.html diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java b/spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/pom.xml b/spring-cloud-modules/spring-cloud-hystrix/rest-producer/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-producer/pom.xml rename to spring-cloud-modules/spring-cloud-hystrix/rest-producer/pom.xml diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java b/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingController.java diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java b/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/GreetingControllerImpl.java diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java b/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/java/com/baeldung/spring/cloud/hystrix/rest/producer/RestProducerApplication.java diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-producer/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-producer/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java b/spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-kubernetes/README.md b/spring-cloud-modules/spring-cloud-kubernetes/README.md similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/README.md rename to spring-cloud-modules/spring-cloud-kubernetes/README.md diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/.gitignore b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/.gitignore rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/.gitignore diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/Dockerfile b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/Dockerfile rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/Dockerfile diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/client-config.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/client-config.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/client-config.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/client-config.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/client-service-deployment.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/client-service-deployment.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/client-service-deployment.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/client-service-deployment.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/pom.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/Application.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/Application.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/Application.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/Application.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientConfig.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientConfig.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientConfig.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientConfig.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientController.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientController.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientController.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/ClientController.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/RibbonConfiguration.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/RibbonConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/RibbonConfiguration.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/RibbonConfiguration.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/TravelAgencyService.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/TravelAgencyService.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/TravelAgencyService.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/java/com/baeldung/spring/cloud/kubernetes/client/TravelAgencyService.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/application.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/application.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/application.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/application.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/client-service/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/client-service/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/deployment-travel-client.sh b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/deployment-travel-client.sh similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/deployment-travel-client.sh rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/deployment-travel-client.sh diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/Dockerfile b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/Dockerfile rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/Dockerfile diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/mongo-deployment.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/mongo-deployment.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/mongo-deployment.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/mongo-deployment.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/pom.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/secret.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/secret.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/secret.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/secret.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/Application.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/Application.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/Application.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/Application.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/controller/TravelAgencyController.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/controller/TravelAgencyController.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/controller/TravelAgencyController.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/controller/TravelAgencyController.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/model/TravelDeal.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/model/TravelDeal.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/model/TravelDeal.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/model/TravelDeal.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/repository/TravelDealRepository.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/repository/TravelDealRepository.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/repository/TravelDealRepository.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/java/com/baeldung/spring/cloud/kubernetes/travelagency/repository/TravelDealRepository.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback-spring.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback-spring.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback-spring.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback-spring.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextTest.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/travel-agency-deployment.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/travel-agency-deployment.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/travel-agency-deployment.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-guide/travel-agency-service/travel-agency-deployment.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/.gitignore b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/.gitignore rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/.gitignore diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/Dockerfile b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/Dockerfile rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/Dockerfile diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/pom.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/java/com/baeldung/spring/cloud/kubernetes/backend/KubernetesBackendApplication.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/java/com/baeldung/spring/cloud/kubernetes/backend/KubernetesBackendApplication.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/java/com/baeldung/spring/cloud/kubernetes/backend/KubernetesBackendApplication.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/java/com/baeldung/spring/cloud/kubernetes/backend/KubernetesBackendApplication.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-backend/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/.gitignore b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/.gitignore rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/.gitignore diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/Dockerfile b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/Dockerfile rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/Dockerfile diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/pom.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/java/com/baeldung/spring/cloud/kubernetes/frontend/KubernetesFrontendApplication.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/java/com/baeldung/spring/cloud/kubernetes/frontend/KubernetesFrontendApplication.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/java/com/baeldung/spring/cloud/kubernetes/frontend/KubernetesFrontendApplication.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/java/com/baeldung/spring/cloud/kubernetes/frontend/KubernetesFrontendApplication.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/demo-frontend/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/backend-deployment.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/backend-deployment.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/backend-deployment.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/backend-deployment.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/frontend-deployment.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/frontend-deployment.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/frontend-deployment.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-minikube/object-configurations/frontend-deployment.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/Dockerfile b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/Dockerfile rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/Dockerfile diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/pom.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/Application.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/Application.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/Application.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/Application.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/health/CustomHealthIndicator.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/health/CustomHealthIndicator.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/health/CustomHealthIndicator.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/java/com/baeldung/liveness/health/CustomHealthIndicator.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/application.properties b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/application.properties rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/application.properties diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/logback.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/logback.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/main/resources/resources/logback.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/liveness-example/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/liveness-example-k8s-template.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/liveness-example-k8s-template.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/liveness-example-k8s-template.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/liveness-example-k8s-template.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/readiness-example-k8s-template.yaml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/readiness-example-k8s-template.yaml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/readiness-example-k8s-template.yaml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/object-configurations/readiness-example-k8s-template.yaml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/Dockerfile b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/Dockerfile similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/Dockerfile rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/Dockerfile diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/pom.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/Application.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/Application.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/Application.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/Application.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/health/CustomHealthIndicator.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/health/CustomHealthIndicator.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/health/CustomHealthIndicator.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/java/com/baeldung/readiness/health/CustomHealthIndicator.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/application.properties b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/application.properties rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/application.properties diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/logback.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/logback.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/main/resources/resources/logback.xml diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/resources/logback-test.xml b/spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/resources/logback-test.xml similarity index 100% rename from spring-cloud/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/resources/logback-test.xml rename to spring-cloud-modules/spring-cloud-kubernetes/kubernetes-selfhealing/readiness-example/src/test/resources/logback-test.xml diff --git a/spring-cloud/spring-cloud-kubernetes/pom.xml b/spring-cloud-modules/spring-cloud-kubernetes/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-kubernetes/pom.xml rename to spring-cloud-modules/spring-cloud-kubernetes/pom.xml index 698bdce1e5..1131db150a 100644 --- a/spring-cloud/spring-cloud-kubernetes/pom.xml +++ b/spring-cloud-modules/spring-cloud-kubernetes/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-loadbalancer/README.md b/spring-cloud-modules/spring-cloud-loadbalancer/README.md similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/README.md rename to spring-cloud-modules/spring-cloud-loadbalancer/README.md diff --git a/spring-cloud/spring-cloud-loadbalancer/pom.xml b/spring-cloud-modules/spring-cloud-loadbalancer/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-loadbalancer/pom.xml rename to spring-cloud-modules/spring-cloud-loadbalancer/pom.xml index 3b81def641..1a16877427 100644 --- a/spring-cloud/spring-cloud-loadbalancer/pom.xml +++ b/spring-cloud-modules/spring-cloud-loadbalancer/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.gitignore b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.gitignore rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.gitignore diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.jar diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/.mvn/wrapper/maven-wrapper.properties diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw.cmd b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw.cmd similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw.cmd rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/mvnw.cmd diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/pom.xml b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/pom.xml rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/pom.xml diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/java/com/baeldung/spring/cloud/loadbalancer/client/ClientApplication.java diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-client/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.gitignore b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.gitignore rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.gitignore diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/MavenWrapperDownloader.java diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.jar diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/.mvn/wrapper/maven-wrapper.properties diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw.cmd b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw.cmd similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw.cmd rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/mvnw.cmd diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/pom.xml b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/pom.xml rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/pom.xml diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/java/com/baeldung/spring/cloud/loadbalancer/server/ServerApplication.java diff --git a/spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-loadbalancer/spring-cloud-loadbalancer-server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-netflix-feign/README.md b/spring-cloud-modules/spring-cloud-netflix-feign/README.md similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/README.md rename to spring-cloud-modules/spring-cloud-netflix-feign/README.md diff --git a/spring-cloud/spring-cloud-netflix-feign/pom.xml b/spring-cloud-modules/spring-cloud-netflix-feign/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/pom.xml rename to spring-cloud-modules/spring-cloud-netflix-feign/pom.xml diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/ExampleApplication.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/ExampleApplication.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/ExampleApplication.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/ExampleApplication.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/client/JSONPlaceHolderClient.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/client/JSONPlaceHolderClient.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/client/JSONPlaceHolderClient.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/client/JSONPlaceHolderClient.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/ClientConfiguration.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/ClientConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/ClientConfiguration.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/ClientConfiguration.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/CustomErrorDecoder.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/CustomErrorDecoder.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/CustomErrorDecoder.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/config/CustomErrorDecoder.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/BadRequestException.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/BadRequestException.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/BadRequestException.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/BadRequestException.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/NotFoundException.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/NotFoundException.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/NotFoundException.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/exception/NotFoundException.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/hystrix/JSONPlaceHolderFallback.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/hystrix/JSONPlaceHolderFallback.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/hystrix/JSONPlaceHolderFallback.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/hystrix/JSONPlaceHolderFallback.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/model/Post.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/model/Post.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/model/Post.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/model/Post.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/JSONPlaceHolderService.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/JSONPlaceHolderService.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/JSONPlaceHolderService.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/JSONPlaceHolderService.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/impl/JSONPlaceHolderServiceImpl.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/impl/JSONPlaceHolderServiceImpl.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/impl/JSONPlaceHolderServiceImpl.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/java/com/baeldung/cloud/netflix/feign/service/impl/JSONPlaceHolderServiceImpl.java diff --git a/spring-cloud/spring-cloud-netflix-feign/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-netflix-feign/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-netflix-feign/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-netflix-feign/src/test/java/com/baeldung/cloud/netflix/feign/NetflixFeignUnitTest.java b/spring-cloud-modules/spring-cloud-netflix-feign/src/test/java/com/baeldung/cloud/netflix/feign/NetflixFeignUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-netflix-feign/src/test/java/com/baeldung/cloud/netflix/feign/NetflixFeignUnitTest.java rename to spring-cloud-modules/spring-cloud-netflix-feign/src/test/java/com/baeldung/cloud/netflix/feign/NetflixFeignUnitTest.java diff --git a/spring-cloud/spring-cloud-open-service-broker/README.md b/spring-cloud-modules/spring-cloud-open-service-broker/README.md similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/README.md rename to spring-cloud-modules/spring-cloud-open-service-broker/README.md diff --git a/spring-cloud/spring-cloud-open-service-broker/pom.xml b/spring-cloud-modules/spring-cloud-open-service-broker/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-open-service-broker/pom.xml rename to spring-cloud-modules/spring-cloud-open-service-broker/pom.xml index ca55bc2147..6dcb27773e 100644 --- a/spring-cloud/spring-cloud-open-service-broker/pom.xml +++ b/spring-cloud-modules/spring-cloud-open-service-broker/pom.xml @@ -9,7 +9,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/ServiceBrokerApplication.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/ServiceBrokerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/ServiceBrokerApplication.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/ServiceBrokerApplication.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/config/CatalogConfiguration.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/config/CatalogConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/config/CatalogConfiguration.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/config/CatalogConfiguration.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailController.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailController.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailController.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailController.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailService.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailService.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailService.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailService.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceBinding.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceBinding.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceBinding.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceBinding.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceInstance.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceInstance.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceInstance.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/mail/MailServiceInstance.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingService.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingService.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingService.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingService.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceService.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceService.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceService.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceService.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-open-service-broker/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-open-service-broker/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingServiceUnitTest.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingServiceUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingServiceUnitTest.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceBindingServiceUnitTest.java diff --git a/spring-cloud/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceServiceUnitTest.java b/spring-cloud-modules/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceServiceUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceServiceUnitTest.java rename to spring-cloud-modules/spring-cloud-open-service-broker/src/test/java/com/baeldung/spring/cloud/openservicebroker/services/MailServiceInstanceServiceUnitTest.java diff --git a/spring-cloud/spring-cloud-openfeign/README.md b/spring-cloud-modules/spring-cloud-openfeign/README.md similarity index 100% rename from spring-cloud/spring-cloud-openfeign/README.md rename to spring-cloud-modules/spring-cloud-openfeign/README.md diff --git a/spring-cloud/spring-cloud-openfeign/pom.xml b/spring-cloud-modules/spring-cloud-openfeign/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-openfeign/pom.xml rename to spring-cloud-modules/spring-cloud-openfeign/pom.xml diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/ExampleApplication.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/ExampleApplication.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/ExampleApplication.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/ExampleApplication.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/JSONPlaceHolderClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/JSONPlaceHolderClient.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/JSONPlaceHolderClient.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/JSONPlaceHolderClient.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/PaymentClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/PaymentClient.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/PaymentClient.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/PaymentClient.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/UserClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/UserClient.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/UserClient.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/client/UserClient.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/ClientConfiguration.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/ClientConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/ClientConfiguration.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/ClientConfiguration.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/CustomErrorDecoder.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/CustomErrorDecoder.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/CustomErrorDecoder.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/CustomErrorDecoder.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/FeignConfig.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/FeignConfig.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/FeignConfig.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/config/FeignConfig.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/PaymentController.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/PaymentController.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/PaymentController.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/controller/PaymentController.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/BadRequestException.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/BadRequestException.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/BadRequestException.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/BadRequestException.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/NotFoundException.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/NotFoundException.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/NotFoundException.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/exception/NotFoundException.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/ExceptionMessage.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/ExceptionMessage.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/ExceptionMessage.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/ExceptionMessage.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/FeignSupportConfig.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/config/RetreiveMessageErrorDecoder.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/controller/FileController.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/controller/FileController.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/controller/FileController.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/controller/FileController.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadClient.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadClient.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadClient.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadClient.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadResource.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadService.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadService.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadService.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/fileupload/service/UploadService.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/hystrix/JSONPlaceHolderFallback.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/hystrix/JSONPlaceHolderFallback.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/hystrix/JSONPlaceHolderFallback.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/hystrix/JSONPlaceHolderFallback.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Payment.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Payment.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Payment.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Payment.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Post.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Post.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Post.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/model/Post.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuth2WebSecurityConfigurerAdapter.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuth2WebSecurityConfigurerAdapter.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuth2WebSecurityConfigurerAdapter.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuth2WebSecurityConfigurerAdapter.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthClientCredentialsFeignManager.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthClientCredentialsFeignManager.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthClientCredentialsFeignManager.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthClientCredentialsFeignManager.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthFeignConfig.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthFeignConfig.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthFeignConfig.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/oauthfeign/OAuthFeignConfig.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/JSONPlaceHolderService.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/JSONPlaceHolderService.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/JSONPlaceHolderService.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/JSONPlaceHolderService.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/impl/JSONPlaceHolderServiceImpl.java b/spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/impl/JSONPlaceHolderServiceImpl.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/impl/JSONPlaceHolderServiceImpl.java rename to spring-cloud-modules/spring-cloud-openfeign/src/main/java/com/baeldung/cloud/openfeign/service/impl/JSONPlaceHolderServiceImpl.java diff --git a/spring-cloud/spring-cloud-openfeign/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-openfeign/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-openfeign/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-openfeign/src/main/resources/fileupload.txt b/spring-cloud-modules/spring-cloud-openfeign/src/main/resources/fileupload.txt similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/main/resources/fileupload.txt rename to spring-cloud-modules/spring-cloud-openfeign/src/main/resources/fileupload.txt diff --git a/spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignFileUploadLiveTest.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignFileUploadLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignFileUploadLiveTest.java rename to spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignFileUploadLiveTest.java diff --git a/spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignManualTest.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignManualTest.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignManualTest.java rename to spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignManualTest.java diff --git a/spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignOAuth2ManualTest.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignOAuth2ManualTest.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignOAuth2ManualTest.java rename to spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/OpenFeignOAuth2ManualTest.java diff --git a/spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java b/spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-rest/.gitignore b/spring-cloud-modules/spring-cloud-rest/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-rest/.gitignore rename to spring-cloud-modules/spring-cloud-rest/.gitignore diff --git a/spring-cloud/spring-cloud-rest/README.md b/spring-cloud-modules/spring-cloud-rest/README.md similarity index 100% rename from spring-cloud/spring-cloud-rest/README.md rename to spring-cloud-modules/spring-cloud-rest/README.md diff --git a/spring-cloud/spring-cloud-rest/application-config/discovery.properties b/spring-cloud-modules/spring-cloud-rest/application-config/discovery.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/application-config/discovery.properties rename to spring-cloud-modules/spring-cloud-rest/application-config/discovery.properties diff --git a/spring-cloud/spring-cloud-rest/application-config/resource.properties b/spring-cloud-modules/spring-cloud-rest/application-config/resource.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/application-config/resource.properties rename to spring-cloud-modules/spring-cloud-rest/application-config/resource.properties diff --git a/spring-cloud/spring-cloud-rest/pom.xml b/spring-cloud-modules/spring-cloud-rest/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-rest/pom.xml rename to spring-cloud-modules/spring-cloud-rest/pom.xml index 8f0b7b8dcc..0b3cda772a 100644 --- a/spring-cloud/spring-cloud-rest/pom.xml +++ b/spring-cloud-modules/spring-cloud-rest/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/pom.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/BooksApiApplication.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/BooksApiApplication.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/BooksApiApplication.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/BooksApiApplication.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/SessionConfig.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/SessionConfig.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/SessionConfig.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/dao/BookRepository.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/dao/BookRepository.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/dao/BookRepository.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/dao/BookRepository.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/model/Book.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/model/Book.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/model/Book.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/java/com/baeldung/persistence/model/Book.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/BooksApiIntegrationTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/BooksApiIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/BooksApiIntegrationTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/BooksApiIntegrationTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/RestApiLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/RestApiLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/RestApiLiveTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/RestApiLiveTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SessionLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SessionLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SessionLiveTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SessionLiveTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-books-api/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/.gitignore diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/pom.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/com/baeldung/SpringCloudRestConfigApplication.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/com/baeldung/SpringCloudRestConfigApplication.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/com/baeldung/SpringCloudRestConfigApplication.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/java/com/baeldung/SpringCloudRestConfigApplication.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/.gitignore diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/pom.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SessionConfig.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SessionConfig.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SessionConfig.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SpringCloudRestServerApplication.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SpringCloudRestServerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SpringCloudRestServerApplication.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/java/com/baeldung/SpringCloudRestServerApplication.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringCloudRestServerIntegrationTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringCloudRestServerIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringCloudRestServerIntegrationTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringCloudRestServerIntegrationTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-discovery-server/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/pom.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/BookReviewsApiApplication.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/BookReviewsApiApplication.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/BookReviewsApiApplication.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/BookReviewsApiApplication.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/SessionConfig.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/SessionConfig.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/SessionConfig.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/SessionConfig.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/dao/BookReviewRepository.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/dao/BookReviewRepository.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/dao/BookReviewRepository.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/dao/BookReviewRepository.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/model/BookReview.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/model/BookReview.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/model/BookReview.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/java/com/baeldung/persistence/model/BookReview.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/BookReviewsApiIntegrationTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/BookReviewsApiIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/BookReviewsApiIntegrationTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/BookReviewsApiIntegrationTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/RestApiLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/RestApiLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/RestApiLiveTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/RestApiLiveTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/java/com/baeldung/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-rest/spring-cloud-rest-reviews-api/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-ribbon-client/README.md b/spring-cloud-modules/spring-cloud-ribbon-client/README.md similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/README.md rename to spring-cloud-modules/spring-cloud-ribbon-client/README.md diff --git a/spring-cloud/spring-cloud-ribbon-client/pom.xml b/spring-cloud-modules/spring-cloud-ribbon-client/pom.xml similarity index 94% rename from spring-cloud/spring-cloud-ribbon-client/pom.xml rename to spring-cloud-modules/spring-cloud-ribbon-client/pom.xml index 3f7d8e9284..b78f6ef5cf 100644 --- a/spring-cloud/spring-cloud-ribbon-client/pom.xml +++ b/spring-cloud-modules/spring-cloud-ribbon-client/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RestTemplateConfiguration.java b/spring-cloud-modules/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RestTemplateConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RestTemplateConfiguration.java rename to spring-cloud-modules/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RestTemplateConfiguration.java diff --git a/spring-cloud/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RibbonConfiguration.java b/spring-cloud-modules/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RibbonConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RibbonConfiguration.java rename to spring-cloud-modules/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/RibbonConfiguration.java diff --git a/spring-cloud/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationApp.java b/spring-cloud-modules/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationApp.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationApp.java rename to spring-cloud-modules/spring-cloud-ribbon-client/src/main/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationApp.java diff --git a/spring-cloud/spring-cloud-ribbon-client/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-ribbon-client/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-ribbon-client/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-ribbon-client/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-ribbon-client/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-ribbon-client/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-ribbon-client/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-ribbon-client/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-ribbon-client/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationAppIntegrationTest.java b/spring-cloud-modules/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationAppIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationAppIntegrationTest.java rename to spring-cloud-modules/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/ServerLocationAppIntegrationTest.java diff --git a/spring-cloud/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/TestConfig.java b/spring-cloud-modules/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/TestConfig.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/TestConfig.java rename to spring-cloud-modules/spring-cloud-ribbon-client/src/test/java/com/baeldung/spring/cloud/ribbon/client/TestConfig.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/README.md b/spring-cloud-modules/spring-cloud-ribbon-retry/README.md similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/README.md rename to spring-cloud-modules/spring-cloud-ribbon-retry/README.md diff --git a/spring-cloud/spring-cloud-ribbon-retry/pom.xml b/spring-cloud-modules/spring-cloud-ribbon-retry/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-ribbon-retry/pom.xml rename to spring-cloud-modules/spring-cloud-ribbon-retry/pom.xml index f167aaa56e..501dfec7dc 100644 --- a/spring-cloud/spring-cloud-ribbon-retry/pom.xml +++ b/spring-cloud-modules/spring-cloud-ribbon-retry/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/pom.xml b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/pom.xml rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/pom.xml diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonClientApp.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonClientApp.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonClientApp.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonClientApp.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialBackoffRetryFactory.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialBackoffRetryFactory.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialBackoffRetryFactory.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialBackoffRetryFactory.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialRandomBackoffRetryFactory.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialRandomBackoffRetryFactory.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialRandomBackoffRetryFactory.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/ExponentialRandomBackoffRetryFactory.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/FixedBackoffRetryFactory.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/FixedBackoffRetryFactory.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/FixedBackoffRetryFactory.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/backoff/FixedBackoffRetryFactory.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/RibbonConfiguration.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/RibbonConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/RibbonConfiguration.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/RibbonConfiguration.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/WeatherClientRibbonConfiguration.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/WeatherClientRibbonConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/WeatherClientRibbonConfiguration.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/config/WeatherClientRibbonConfiguration.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/controller/RibbonClientController.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/controller/RibbonClientController.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/controller/RibbonClientController.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/controller/RibbonClientController.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetryFailureManualTest.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetryFailureManualTest.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetryFailureManualTest.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetryFailureManualTest.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetrySuccessManualTest.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetrySuccessManualTest.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetrySuccessManualTest.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-client-service/src/test/java/com/baeldung/spring/cloud/ribbon/retry/RibbonRetrySuccessManualTest.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/pom.xml b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/pom.xml rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/pom.xml diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonWeatherServiceApp.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonWeatherServiceApp.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonWeatherServiceApp.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/RibbonWeatherServiceApp.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/WeatherController.java b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/WeatherController.java similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/WeatherController.java rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/java/com/baeldung/spring/cloud/ribbon/retry/WeatherController.java diff --git a/spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-ribbon-retry/ribbon-weather-service/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-security/README.md b/spring-cloud-modules/spring-cloud-security/README.md similarity index 100% rename from spring-cloud/spring-cloud-security/README.md rename to spring-cloud-modules/spring-cloud-security/README.md diff --git a/spring-cloud/spring-cloud-security/alias.rtf b/spring-cloud-modules/spring-cloud-security/alias.rtf similarity index 100% rename from spring-cloud/spring-cloud-security/alias.rtf rename to spring-cloud-modules/spring-cloud-security/alias.rtf diff --git a/spring-cloud/spring-cloud-security/auth-client/pom.xml b/spring-cloud-modules/spring-cloud-security/auth-client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/pom.xml rename to spring-cloud-modules/spring-cloud-security/auth-client/pom.xml diff --git a/spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/CloudSite.java b/spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/CloudSite.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/CloudSite.java rename to spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/CloudSite.java diff --git a/spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/config/SiteSecurityConfigurer.java b/spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/config/SiteSecurityConfigurer.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/config/SiteSecurityConfigurer.java rename to spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/config/SiteSecurityConfigurer.java diff --git a/spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/controller/CloudSiteController.java b/spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/controller/CloudSiteController.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/controller/CloudSiteController.java rename to spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/controller/CloudSiteController.java diff --git a/spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/filters/SimpleFilter.java b/spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/filters/SimpleFilter.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/main/java/com/baeldung/filters/SimpleFilter.java rename to spring-cloud-modules/spring-cloud-security/auth-client/src/main/java/com/baeldung/filters/SimpleFilter.java diff --git a/spring-cloud/spring-cloud-security/auth-client/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-security/auth-client/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-security/auth-client/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-security/auth-client/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-security/auth-client/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-security/auth-client/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-security/auth-client/src/main/resources/templates/personinfo.html b/spring-cloud-modules/spring-cloud-security/auth-client/src/main/resources/templates/personinfo.html similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/main/resources/templates/personinfo.html rename to spring-cloud-modules/spring-cloud-security/auth-client/src/main/resources/templates/personinfo.html diff --git a/spring-cloud/spring-cloud-security/auth-client/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-security/auth-client/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-security/auth-client/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-security/auth-client/src/test/java/com/baeldung/example/springoath2/Springoath2ApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-security/auth-client/src/test/java/com/baeldung/example/springoath2/Springoath2ApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-client/src/test/java/com/baeldung/example/springoath2/Springoath2ApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-security/auth-client/src/test/java/com/baeldung/example/springoath2/Springoath2ApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-security/auth-resource/pom.xml b/spring-cloud-modules/spring-cloud-security/auth-resource/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/pom.xml rename to spring-cloud-modules/spring-cloud-security/auth-resource/pom.xml diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/Application.java b/spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/Application.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/Application.java rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/Application.java diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/config/ResourceConfigurer.java b/spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/config/ResourceConfigurer.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/config/ResourceConfigurer.java rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/config/ResourceConfigurer.java diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/PersonInfoController.java b/spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/PersonInfoController.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/PersonInfoController.java rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/PersonInfoController.java diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/ResourceController.java b/spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/ResourceController.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/ResourceController.java rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/controller/ResourceController.java diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/model/Person.java b/spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/model/Person.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/main/java/com/baeldung/model/Person.java rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/main/java/com/baeldung/model/Person.java diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-security/auth-resource/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-security/auth-resource/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-security/auth-resource/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-security/auth-resource/src/test/java/com/baeldung/service/personservice/PersonserviceApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-security/auth-server/pom.xml b/spring-cloud-modules/spring-cloud-security/auth-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/pom.xml rename to spring-cloud-modules/spring-cloud-security/auth-server/pom.xml diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/AuthServer.java b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/AuthServer.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/AuthServer.java rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/AuthServer.java diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/AuthServerConfigurer.java b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/AuthServerConfigurer.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/AuthServerConfigurer.java rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/AuthServerConfigurer.java diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebMvcConfig.java b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebMvcConfig.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebMvcConfig.java rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebMvcConfig.java diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebSecurityConfigurer.java b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebSecurityConfigurer.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebSecurityConfigurer.java rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/java/com/baeldung/config/WebSecurityConfigurer.java diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/resources/certificate/mykeystore.jks b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/certificate/mykeystore.jks similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/resources/certificate/mykeystore.jks rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/certificate/mykeystore.jks diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-security/auth-server/src/main/resources/templates/login.html b/spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/templates/login.html similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/main/resources/templates/login.html rename to spring-cloud-modules/spring-cloud-security/auth-server/src/main/resources/templates/login.html diff --git a/spring-cloud/spring-cloud-security/auth-server/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-security/auth-server/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-security/auth-server/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-security/auth-server/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-security/mykeystore.jks b/spring-cloud-modules/spring-cloud-security/mykeystore.jks similarity index 100% rename from spring-cloud/spring-cloud-security/mykeystore.jks rename to spring-cloud-modules/spring-cloud-security/mykeystore.jks diff --git a/spring-cloud/spring-cloud-security/pom.xml b/spring-cloud-modules/spring-cloud-security/pom.xml similarity index 95% rename from spring-cloud/spring-cloud-security/pom.xml rename to spring-cloud-modules/spring-cloud-security/pom.xml index 001c9a5c7e..43eb6e61e8 100644 --- a/spring-cloud/spring-cloud-security/pom.xml +++ b/spring-cloud-modules/spring-cloud-security/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-security/pubkey.txt b/spring-cloud-modules/spring-cloud-security/pubkey.txt similarity index 100% rename from spring-cloud/spring-cloud-security/pubkey.txt rename to spring-cloud-modules/spring-cloud-security/pubkey.txt diff --git a/spring-cloud/spring-cloud-sentinel/README.md b/spring-cloud-modules/spring-cloud-sentinel/README.md similarity index 100% rename from spring-cloud/spring-cloud-sentinel/README.md rename to spring-cloud-modules/spring-cloud-sentinel/README.md diff --git a/spring-cloud/spring-cloud-sentinel/pom.xml b/spring-cloud-modules/spring-cloud-sentinel/pom.xml similarity index 95% rename from spring-cloud/spring-cloud-sentinel/pom.xml rename to spring-cloud-modules/spring-cloud-sentinel/pom.xml index f26a13f6f8..bd2630c78d 100644 --- a/spring-cloud/spring-cloud-sentinel/pom.xml +++ b/spring-cloud-modules/spring-cloud-sentinel/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/SentinelApplication.java b/spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/SentinelApplication.java similarity index 100% rename from spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/SentinelApplication.java rename to spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/SentinelApplication.java diff --git a/spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/config/SentinelAspectConfiguration.java b/spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/config/SentinelAspectConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/config/SentinelAspectConfiguration.java rename to spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/config/SentinelAspectConfiguration.java diff --git a/spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/controller/GreetingController.java b/spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/controller/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/controller/GreetingController.java rename to spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/controller/GreetingController.java diff --git a/spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/service/GreetingService.java b/spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/service/GreetingService.java similarity index 100% rename from spring-cloud/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/service/GreetingService.java rename to spring-cloud-modules/spring-cloud-sentinel/src/main/java/com/baeldung/spring/cloud/sentinel/service/GreetingService.java diff --git a/spring-cloud/spring-cloud-stream-starters/README.md b/spring-cloud-modules/spring-cloud-stream-starters/README.md similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/README.md rename to spring-cloud-modules/spring-cloud-stream-starters/README.md diff --git a/spring-cloud/spring-cloud-stream-starters/bash/hadoop.sh b/spring-cloud-modules/spring-cloud-stream-starters/bash/hadoop.sh similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/bash/hadoop.sh rename to spring-cloud-modules/spring-cloud-stream-starters/bash/hadoop.sh diff --git a/spring-cloud/spring-cloud-stream-starters/hdfs/application.properties b/spring-cloud-modules/spring-cloud-stream-starters/hdfs/application.properties similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/hdfs/application.properties rename to spring-cloud-modules/spring-cloud-stream-starters/hdfs/application.properties diff --git a/spring-cloud/spring-cloud-stream-starters/hdfs/hdfs.sh b/spring-cloud-modules/spring-cloud-stream-starters/hdfs/hdfs.sh similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/hdfs/hdfs.sh rename to spring-cloud-modules/spring-cloud-stream-starters/hdfs/hdfs.sh diff --git a/spring-cloud/spring-cloud-stream-starters/twitter/application.properties b/spring-cloud-modules/spring-cloud-stream-starters/twitter/application.properties similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitter/application.properties rename to spring-cloud-modules/spring-cloud-stream-starters/twitter/application.properties diff --git a/spring-cloud/spring-cloud-stream-starters/twitter/twitter.sh b/spring-cloud-modules/spring-cloud-stream-starters/twitter/twitter.sh similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitter/twitter.sh rename to spring-cloud-modules/spring-cloud-stream-starters/twitter/twitter.sh diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/.gitignore b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/.gitignore rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/.gitignore diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/pom.xml b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/pom.xml rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/pom.xml diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/aggregate/AggregateApp.java b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/aggregate/AggregateApp.java similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/aggregate/AggregateApp.java rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/aggregate/AggregateApp.java diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/processor/ProcessorApp.java b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/processor/ProcessorApp.java similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/processor/ProcessorApp.java rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/processor/ProcessorApp.java diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/sink/SinkApp.java b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/sink/SinkApp.java similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/sink/SinkApp.java rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/sink/SinkApp.java diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/source/SourceApp.java b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/source/SourceApp.java similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/source/SourceApp.java rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/java/com/baeldung/twitterhdfs/source/SourceApp.java diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextTest.java b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-stream/README.md b/spring-cloud-modules/spring-cloud-stream/README.md similarity index 100% rename from spring-cloud/spring-cloud-stream/README.md rename to spring-cloud-modules/spring-cloud-stream/README.md diff --git a/spring-cloud/spring-cloud-stream/pom.xml b/spring-cloud-modules/spring-cloud-stream/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-stream/pom.xml rename to spring-cloud-modules/spring-cloud-stream/pom.xml index 96a7ad012b..1eed9ae8a9 100644 --- a/spring-cloud/spring-cloud-stream/pom.xml +++ b/spring-cloud-modules/spring-cloud-stream/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/README.md b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/README.md similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/README.md rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/README.md diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/pom.xml diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/AvroKafkaApplication.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/AvroKafkaApplication.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/AvroKafkaApplication.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/AvroKafkaApplication.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/config/SchemRegistryConfig.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/config/SchemRegistryConfig.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/config/SchemRegistryConfig.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/config/SchemRegistryConfig.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/consumer/AvroConsumer.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/consumer/AvroConsumer.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/consumer/AvroConsumer.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/consumer/AvroConsumer.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/controller/AvroController.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/controller/AvroController.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/controller/AvroController.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/controller/AvroController.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/producer/AvroProducer.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/producer/AvroProducer.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/producer/AvroProducer.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/java/com/baeldung/producer/AvroProducer.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/application.yaml b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/application.yaml similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/application.yaml rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/application.yaml diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-key-schema.avsc b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-key-schema.avsc similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-key-schema.avsc rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-key-schema.avsc diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-schema.avsc b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-schema.avsc similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-schema.avsc rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kafka/src/main/resources/employee-schema.avsc diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/pom.xml b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/pom.xml rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/pom.xml diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/java/com/baeldung/KinesisApplication.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/java/com/baeldung/KinesisApplication.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/java/com/baeldung/KinesisApplication.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/java/com/baeldung/KinesisApplication.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/java/com/baeldung/KinesisApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/java/com/baeldung/KinesisApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/java/com/baeldung/KinesisApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/java/com/baeldung/KinesisApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-kinesis/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/pom.xml diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplication.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplication.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplication.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplication.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplication.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceApplication.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerServiceApplication.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerServiceApplication.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerServiceApplication.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/messages/TextPlainMessageConverter.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/messages/TextPlainMessageConverter.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/messages/TextPlainMessageConverter.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/messages/TextPlainMessageConverter.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/model/LogMessage.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/model/LogMessage.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/model/LogMessage.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/model/LogMessage.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/processor/MyProcessor.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/processor/MyProcessor.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/processor/MyProcessor.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/java/com/baeldung/spring/cloud/stream/rabbit/processor/MyProcessor.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsServiceApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MultipleOutputsWithConditionsServiceIntegrationTest.java diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/com/baeldung/spring/cloud/stream/rabbit/MyLoggerApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-task/README.md b/spring-cloud-modules/spring-cloud-task/README.md similarity index 100% rename from spring-cloud/spring-cloud-task/README.md rename to spring-cloud-modules/spring-cloud-task/README.md diff --git a/spring-cloud/spring-cloud-task/pom.xml b/spring-cloud-modules/spring-cloud-task/pom.xml similarity index 96% rename from spring-cloud/spring-cloud-task/pom.xml rename to spring-cloud-modules/spring-cloud-task/pom.xml index e1567b300f..bbe5d6d49d 100644 --- a/spring-cloud/spring-cloud-task/pom.xml +++ b/spring-cloud-modules/spring-cloud-task/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/.gitignore b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/.gitignore rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/.gitignore diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/pom.xml b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/pom.xml rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/pom.xml diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/HelloWorldTaskConfigurer.java b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/HelloWorldTaskConfigurer.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/HelloWorldTaskConfigurer.java rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/HelloWorldTaskConfigurer.java diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/JobConfiguration.java b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/JobConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/JobConfiguration.java rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/JobConfiguration.java diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskDemo.java b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskDemo.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskDemo.java rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskDemo.java diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskListener.java b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskListener.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskListener.java rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/java/com/baeldung/task/TaskListener.java diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/resources/application.yml b/spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/test/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/resources/application.yml rename to spring-cloud-modules/spring-cloud-task/springcloudtaskbatch/src/test/resources/application.yml diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/.gitignore b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/.gitignore rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/.gitignore diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/pom.xml b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/pom.xml rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/pom.xml diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/src/main/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplication.java b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplication.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/src/main/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplication.java rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplication.java diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/SpringCloudTaskSinkApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/TaskSinkConfiguration.java b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/TaskSinkConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/TaskSinkConfiguration.java rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringCloudTaskFinal/TaskSinkConfiguration.java diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-task/springcloudtasksink/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-vault/.gitignore b/spring-cloud-modules/spring-cloud-vault/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-vault/.gitignore rename to spring-cloud-modules/spring-cloud-vault/.gitignore diff --git a/spring-cloud/spring-cloud-vault/README.md b/spring-cloud-modules/spring-cloud-vault/README.md similarity index 100% rename from spring-cloud/spring-cloud-vault/README.md rename to spring-cloud-modules/spring-cloud-vault/README.md diff --git a/spring-cloud/spring-cloud-vault/database-setup.sql b/spring-cloud-modules/spring-cloud-vault/database-setup.sql similarity index 100% rename from spring-cloud/spring-cloud-vault/database-setup.sql rename to spring-cloud-modules/spring-cloud-vault/database-setup.sql diff --git a/spring-cloud/spring-cloud-vault/pom.xml b/spring-cloud-modules/spring-cloud-vault/pom.xml similarity index 97% rename from spring-cloud/spring-cloud-vault/pom.xml rename to spring-cloud-modules/spring-cloud-vault/pom.xml index f24861ed6e..e4cf020986 100644 --- a/spring-cloud/spring-cloud-vault/pom.xml +++ b/spring-cloud-modules/spring-cloud-vault/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-vault/sample-policy.hcl b/spring-cloud-modules/spring-cloud-vault/sample-policy.hcl similarity index 100% rename from spring-cloud/spring-cloud-vault/sample-policy.hcl rename to spring-cloud-modules/spring-cloud-vault/sample-policy.hcl diff --git a/spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountRepo.java b/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountRepo.java similarity index 100% rename from spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountRepo.java rename to spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountRepo.java diff --git a/spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountResource.java b/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountResource.java similarity index 100% rename from spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountResource.java rename to spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/AccountResource.java diff --git a/spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/SecretResource.java b/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/SecretResource.java similarity index 100% rename from spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/SecretResource.java rename to spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/SecretResource.java diff --git a/spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplication.java b/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplication.java similarity index 100% rename from spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplication.java rename to spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplication.java diff --git a/spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/domain/Account.java b/spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/domain/Account.java similarity index 100% rename from spring-cloud/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/domain/Account.java rename to spring-cloud-modules/spring-cloud-vault/src/main/java/com/baeldung/spring/cloud/vaultsample/domain/Account.java diff --git a/spring-cloud/spring-cloud-vault/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-vault/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-vault/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-vault/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-vault/src/main/resources/vault.jks b/spring-cloud-modules/spring-cloud-vault/src/main/resources/vault.jks similarity index 100% rename from spring-cloud/spring-cloud-vault/src/main/resources/vault.jks rename to spring-cloud-modules/spring-cloud-vault/src/main/resources/vault.jks diff --git a/spring-cloud/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java b/spring-cloud-modules/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java rename to spring-cloud-modules/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/SpringContextLiveTest.java diff --git a/spring-cloud/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java b/spring-cloud-modules/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java rename to spring-cloud-modules/spring-cloud-vault/src/test/java/com/baeldung/spring/cloud/vaultsample/VaultSampleApplicationLiveTest.java diff --git a/spring-cloud/spring-cloud-vault/src/test/resources/bootstrap.properties b/spring-cloud-modules/spring-cloud-vault/src/test/resources/bootstrap.properties similarity index 100% rename from spring-cloud/spring-cloud-vault/src/test/resources/bootstrap.properties rename to spring-cloud-modules/spring-cloud-vault/src/test/resources/bootstrap.properties diff --git a/spring-cloud/spring-cloud-vault/src/test/resources/vault.jks b/spring-cloud-modules/spring-cloud-vault/src/test/resources/vault.jks similarity index 100% rename from spring-cloud/spring-cloud-vault/src/test/resources/vault.jks rename to spring-cloud-modules/spring-cloud-vault/src/test/resources/vault.jks diff --git a/spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.cert b/spring-cloud-modules/spring-cloud-vault/src/test/vault-config/localhost.cert similarity index 100% rename from spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.cert rename to spring-cloud-modules/spring-cloud-vault/src/test/vault-config/localhost.cert diff --git a/spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.key b/spring-cloud-modules/spring-cloud-vault/src/test/vault-config/localhost.key similarity index 100% rename from spring-cloud/spring-cloud-vault/src/test/vault-config/localhost.key rename to spring-cloud-modules/spring-cloud-vault/src/test/vault-config/localhost.key diff --git a/spring-cloud/spring-cloud-vault/src/test/vault-config/vault-test.hcl b/spring-cloud-modules/spring-cloud-vault/src/test/vault-config/vault-test.hcl similarity index 100% rename from spring-cloud/spring-cloud-vault/src/test/vault-config/vault-test.hcl rename to spring-cloud-modules/spring-cloud-vault/src/test/vault-config/vault-test.hcl diff --git a/spring-cloud/spring-cloud-vault/vault-cheatsheet.txt b/spring-cloud-modules/spring-cloud-vault/vault-cheatsheet.txt similarity index 100% rename from spring-cloud/spring-cloud-vault/vault-cheatsheet.txt rename to spring-cloud-modules/spring-cloud-vault/vault-cheatsheet.txt diff --git a/spring-cloud/spring-cloud-vault/vault-env.bat b/spring-cloud-modules/spring-cloud-vault/vault-env.bat similarity index 100% rename from spring-cloud/spring-cloud-vault/vault-env.bat rename to spring-cloud-modules/spring-cloud-vault/vault-env.bat diff --git a/spring-cloud/spring-cloud-vault/vault-env.sh b/spring-cloud-modules/spring-cloud-vault/vault-env.sh similarity index 100% rename from spring-cloud/spring-cloud-vault/vault-env.sh rename to spring-cloud-modules/spring-cloud-vault/vault-env.sh diff --git a/spring-cloud/spring-cloud-vault/vault-start.bat b/spring-cloud-modules/spring-cloud-vault/vault-start.bat similarity index 100% rename from spring-cloud/spring-cloud-vault/vault-start.bat rename to spring-cloud-modules/spring-cloud-vault/vault-start.bat diff --git a/spring-cloud/spring-cloud-vault/vault-start.sh b/spring-cloud-modules/spring-cloud-vault/vault-start.sh similarity index 100% rename from spring-cloud/spring-cloud-vault/vault-start.sh rename to spring-cloud-modules/spring-cloud-vault/vault-start.sh diff --git a/spring-cloud/spring-cloud-vault/vault-unseal.bat b/spring-cloud-modules/spring-cloud-vault/vault-unseal.bat similarity index 100% rename from spring-cloud/spring-cloud-vault/vault-unseal.bat rename to spring-cloud-modules/spring-cloud-vault/vault-unseal.bat diff --git a/spring-cloud/spring-cloud-vault/vault-unseal.sh b/spring-cloud-modules/spring-cloud-vault/vault-unseal.sh similarity index 100% rename from spring-cloud/spring-cloud-vault/vault-unseal.sh rename to spring-cloud-modules/spring-cloud-vault/vault-unseal.sh diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/pom.xml rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/pom.xml diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingApplication.java diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/GreetingController.java diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/java/com/baeldung/spring/cloud/greeting/HelloWorldClient.java diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/main/resources/templates/greeting-view.html b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/templates/greeting-view.html similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/src/main/resources/templates/greeting-view.html rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/main/resources/templates/greeting-view.html diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/Greeting/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zookeeper/Greeting/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/pom.xml b/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/HelloWorld/pom.xml rename to spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/pom.xml diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java b/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java rename to spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldApplication.java diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java b/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java rename to spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/java/com/baeldung/spring/cloud/helloworld/HelloWorldController.java diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/HelloWorld/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zookeeper/README.md b/spring-cloud-modules/spring-cloud-zookeeper/README.md similarity index 100% rename from spring-cloud/spring-cloud-zookeeper/README.md rename to spring-cloud-modules/spring-cloud-zookeeper/README.md diff --git a/spring-cloud/spring-cloud-zookeeper/pom.xml b/spring-cloud-modules/spring-cloud-zookeeper/pom.xml similarity index 90% rename from spring-cloud/spring-cloud-zookeeper/pom.xml rename to spring-cloud-modules/spring-cloud-zookeeper/pom.xml index 3fb899ec47..a3567adb06 100644 --- a/spring-cloud/spring-cloud-zookeeper/pom.xml +++ b/spring-cloud-modules/spring-cloud-zookeeper/pom.xml @@ -9,7 +9,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/README.md b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/README.md similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/README.md rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/README.md diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/EurekaClientApplication.java diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/java/com/baeldung/spring/cloud/eureka/client/GreetingController.java diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/main/java/com/baeldung/spring/cloud/eureka/server/EurekaServerApplication.java diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/pom.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/pom.xml similarity index 94% rename from spring-cloud/spring-cloud-zuul-eureka-integration/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/pom.xml index ceb85fe080..efc3e155bb 100644 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/pom.xml +++ b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/java/com/baeldung/spring/cloud/zuul/config/ZuulConfig.java b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/main/java/com/baeldung/spring/cloud/zuul/config/ZuulConfig.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/java/com/baeldung/spring/cloud/zuul/config/ZuulConfig.java rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/main/java/com/baeldung/spring/cloud/zuul/config/ZuulConfig.java diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/README.md b/spring-cloud-modules/spring-cloud-zuul-fallback/README.md similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/README.md rename to spring-cloud-modules/spring-cloud-zuul-fallback/README.md diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/pom.xml b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/pom.xml diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplication.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayClientResponse.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallback.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallback.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/ApiGatewayApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/GatewayServiceFallbackUnitTest.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/java/com/baeldung/spring/cloud/apigateway/fallback/WeatherServiceFallbackUnitTest.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/api-gateway/src/test/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul-fallback/api-gateway/src/test/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zuul-fallback/pom.xml b/spring-cloud-modules/spring-cloud-zuul-fallback/pom.xml similarity index 93% rename from spring-cloud/spring-cloud-zuul-fallback/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-fallback/pom.xml index d55930c6e8..7cddec48fe 100644 --- a/spring-cloud/spring-cloud-zuul-fallback/pom.xml +++ b/spring-cloud-modules/spring-cloud-zuul-fallback/pom.xml @@ -10,7 +10,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT @@ -25,4 +25,4 @@ 3.1.1 - \ No newline at end of file + diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/pom.xml b/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/weather-service/pom.xml rename to spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/pom.xml diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java b/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherController.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java b/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplication.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherControllerIntegrationTest.java diff --git a/spring-cloud/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java b/spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java rename to spring-cloud-modules/spring-cloud-zuul-fallback/weather-service/src/test/java/com/baeldung/spring/cloud/weatherservice/WeatherServiceApplicationIntegrationTest.java diff --git a/spring-cloud/spring-cloud-zuul/README.md b/spring-cloud-modules/spring-cloud-zuul/README.md similarity index 100% rename from spring-cloud/spring-cloud-zuul/README.md rename to spring-cloud-modules/spring-cloud-zuul/README.md diff --git a/spring-cloud/spring-cloud-zuul/pom.xml b/spring-cloud-modules/spring-cloud-zuul/pom.xml similarity index 97% rename from spring-cloud/spring-cloud-zuul/pom.xml rename to spring-cloud-modules/spring-cloud-zuul/pom.xml index 7e56a8c359..e99cbdf355 100644 --- a/spring-cloud/spring-cloud-zuul/pom.xml +++ b/spring-cloud-modules/spring-cloud-zuul/pom.xml @@ -11,7 +11,7 @@ com.baeldung.spring.cloud - spring-cloud + spring-cloud-modules 1.0.0-SNAPSHOT diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/pom.xml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/pom.xml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/pom.xml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerApplication.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerApplication.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerApplication.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerWebConfig.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerWebConfig.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerWebConfig.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/config/ResourceServerWebConfig.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/controller/FooController.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/controller/FooController.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/controller/FooController.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/controller/FooController.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/dto/Foo.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/dto/Foo.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/dto/Foo.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/java/com/baeldung/web/dto/Foo.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/application.properties b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/application.properties rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/application.properties diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/.gitignore b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/.gitignore rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/.gitignore diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/pom.xml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/pom.xml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/pom.xml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/ZuulPostFilterApplication.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/ZuulPostFilterApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/ZuulPostFilterApplication.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/ZuulPostFilterApplication.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/controllers/GreetingController.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/controllers/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/controllers/GreetingController.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/controllers/GreetingController.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/filters/ResponseLogFilter.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/filters/ResponseLogFilter.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/filters/ResponseLogFilter.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/java/com/baeldung/filters/ResponseLogFilter.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/test/java/com/baeldung/ZuulPostFilterLiveTest.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/test/java/com/baeldung/ZuulPostFilterLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-post-filter/src/test/java/com/baeldung/ZuulPostFilterLiveTest.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-post-filter/src/test/java/com/baeldung/ZuulPostFilterLiveTest.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/ZuulRatelimitDemoApplication.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingController.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerIntegrationTest.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerIntegrationTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerIntegrationTest.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/GreetingControllerIntegrationTest.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/application.properties b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/application.properties similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/application.properties rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/application.properties diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/README.md b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/README.md similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/README.md rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/README.md diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/pom.xml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/pom.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/pom.xml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/pom.xml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/CustomZuulFilter.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/CustomZuulFilter.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/CustomZuulFilter.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/CustomZuulFilter.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiApplication.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiApplication.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiApplication.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiWebConfig.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiWebConfig.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiWebConfig.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/config/UiWebConfig.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorApplication.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorApplication.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorApplication.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorApplication.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilter.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilter.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilter.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilter.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/ZuulConfiguration.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/ZuulConfiguration.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/ZuulConfiguration.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/java/com/baeldung/spring/cloud/zuul/filter/ZuulConfiguration.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/application.yml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/resources/application.yml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/application.yml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/resources/application.yml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/logback.xml b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/resources/logback.xml similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/logback.xml rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/resources/logback.xml diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/templates/index.html b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/resources/templates/index.html similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/resources/templates/index.html rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/resources/templates/index.html diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/webapp/resources/angular-utf8-base64.min.js b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/webapp/resources/angular-utf8-base64.min.js similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/main/webapp/resources/angular-utf8-base64.min.js rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/main/webapp/resources/angular-utf8-base64.min.js diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextTest.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilterLiveTest.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilterLiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilterLiveTest.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/spring/cloud/zuul/filter/CustomZuulErrorFilterLiveTest.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/web/LiveTest.java b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/web/LiveTest.java similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/web/LiveTest.java rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/web/LiveTest.java diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/resources/.gitignore b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/resources/.gitignore similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/resources/.gitignore rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/resources/.gitignore diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/resources/persistence-mysql.properties b/spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/resources/persistence-mysql.properties similarity index 100% rename from spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/resources/persistence-mysql.properties rename to spring-cloud-modules/spring-cloud-zuul/spring-zuul-ui/src/test/resources/persistence-mysql.properties diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/pom.xml deleted file mode 100644 index 5c9f85d06e..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - eureka-client - 1.0.0-SNAPSHOT - eureka-client - jar - Spring Cloud Eureka Sample Client - - - com.baeldung.spring.cloud - spring-cloud-zuul-eureka-integration - 1.0.0-SNAPSHOT - - - - - - org.springframework.cloud - spring-cloud-starter-parent - ${spring-cloud-dependencies.version} - pom - import - - - - - - - org.springframework.cloud - spring-cloud-starter-eureka - ${spring-cloud-starter-eureka.version} - - - org.springframework.boot - spring-boot-starter-web - - - - \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/src/main/resources/application.yml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/src/main/resources/application.yml deleted file mode 100644 index 08624aa159..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-client/src/main/resources/application.yml +++ /dev/null @@ -1,13 +0,0 @@ -spring: - application: - name: spring-cloud-eureka-client - -server: - port: 0 - -eureka: - client: - serviceUrl: - defaultZone: ${EUREKA_URI:http://localhost:8761/eureka} - instance: - preferIpAddress: true \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/pom.xml deleted file mode 100644 index 2d2a94d779..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/eureka-server/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - 4.0.0 - eureka-server - 1.0.0-SNAPSHOT - eureka-server - jar - Spring Cloud Eureka Server Demo - - - com.baeldung.spring.cloud - spring-cloud-zuul-eureka-integration - 1.0.0-SNAPSHOT - - - - - - org.springframework.cloud - spring-cloud-starter-parent - ${spring-cloud-dependencies.version} - pom - import - - - - - - - org.springframework.cloud - spring-cloud-starter-eureka-server - ${spring-cloud-starter-eureka.version} - - - commons-configuration - commons-configuration - ${commons-config.version} - - - - \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml deleted file mode 100644 index 81a4b9202c..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - spring-cloud-zuul-eureka-integration - 1.0.0-SNAPSHOT - Spring Cloud Zuul and Eureka Integration - pom - Spring Cloud Zuul and Eureka Integration - - - com.baeldung.spring.cloud - spring-cloud - 1.0.0-SNAPSHOT - .. - - - - zuul-server - eureka-server - eureka-client - - - - 3.7.0 - 1.4.2.RELEASE - 1.10 - - - \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/pom.xml b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/pom.xml deleted file mode 100644 index 37fe4815bb..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - 4.0.0 - zuul-server - - - com.baeldung.spring.cloud - spring-cloud-zuul-eureka-integration - 1.0.0-SNAPSHOT - - - - - - org.springframework.cloud - spring-cloud-starter-parent - ${spring-cloud-dependencies.version} - pom - import - - - - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.cloud - spring-cloud-starter-zuul - - - org.springframework.cloud - spring-cloud-starter-eureka - - - commons-configuration - commons-configuration - ${commons-config.version} - - - org.springframework.boot - spring-boot-starter-security - - - - \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/src/main/resources/application.properties b/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/src/main/resources/application.properties deleted file mode 100644 index cb1dca78c2..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/bin/zuul-server/src/main/resources/application.properties +++ /dev/null @@ -1,9 +0,0 @@ -server.port=8762 -spring.application.name=zuul-server -eureka.instance.preferIpAddress=true -eureka.client.registerWithEureka=true -eureka.client.fetchRegistry=true -eureka.serviceurl.defaultzone=http://localhost:8761/eureka/ -management.security.enabled=false -security.basic.enabled=false -hystrix.command.default.execution.timeout.enabled=false diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml deleted file mode 100644 index 49c3179bb5..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/main/resources/application.yml +++ /dev/null @@ -1,7 +0,0 @@ -server: - port: 8761 - -eureka: - client: - registerWithEureka: false - fetchRegistry: false \ No newline at end of file From 4785a247953adce670d84c0a8150a18852a25592 Mon Sep 17 00:00:00 2001 From: maryarm <45322329+maryarm@users.noreply.github.com> Date: Tue, 31 May 2022 05:00:17 +0200 Subject: [PATCH 6/7] BAEL-5266: Netflix sidecar demo applications created. (#12183) * BAEL-5266: Netflix sidecar demo applications created. * BAEL-5266: Changed NodeJS endpoint to hello * BAEL-5266: Removed .gitignore files as the .gitignore is already available in project scope. --- .../echo-demo/pom.xml | 48 +++++++++++++++++ .../baeldung/cloud/echo/EchoApplication.java | 48 +++++++++++++++++ .../src/main/resources/application.yml | 14 +++++ .../cloud/echo/SpringContextTest.java | 11 ++++ .../spring-cloud-netflix-sidecar/pom.xml | 27 ++++++++++ .../sidecar-demo/nodejs/hello.js | 19 +++++++ .../sidecar-demo/pom.xml | 52 +++++++++++++++++++ .../cloud/sidecar/SidecarApplication.java | 13 +++++ .../src/main/resources/application.yml | 17 ++++++ .../cloud/sidecar/SpringContextTest.java | 11 ++++ 10 files changed, 260 insertions(+) create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/echo-demo/pom.xml create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/pom.xml create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml create mode 100644 spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java diff --git a/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/pom.xml b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/pom.xml new file mode 100644 index 0000000000..60b6eab020 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + echo-demo + echo-demo + Demo for echo endpoint + + com.baeldung.cloud + spring-cloud-netflix-sidecar + 0.0.1-SNAPSHOT + ../pom.xml + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.cloud + spring-cloud-starter-netflix-zuul + 2.2.10.RELEASE + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + 2.2.10.RELEASE + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java new file mode 100644 index 0000000000..d869ba8f65 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/java/com/baeldung/cloud/echo/EchoApplication.java @@ -0,0 +1,48 @@ +package com.baeldung.cloud.echo; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.client.ServiceInstance; +import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.cloud.netflix.eureka.EnableEurekaClient; +import org.springframework.cloud.netflix.zuul.EnableZuulProxy; +import org.springframework.context.annotation.Bean; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; + +import java.util.List; + +@SpringBootApplication +@EnableEurekaClient +@EnableZuulProxy +@RestController +public class EchoApplication { + @Autowired + DiscoveryClient discoveryClient; + @Autowired + RestTemplate restTemplate; + + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } + + @GetMapping("/hello/{me}") + public ResponseEntity echo(@PathVariable("me") String me) { + List instances = discoveryClient.getInstances("sidecar"); + if (instances.isEmpty()) { + return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE).body("hello service is down"); + } + String url = instances.get(0).getUri().toString(); + return ResponseEntity.ok(restTemplate.getForObject(url + "/hello/" + me, String.class)); + } + + public static void main(String[] args) { + SpringApplication.run(EchoApplication.class, args); + } +} diff --git a/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml new file mode 100644 index 0000000000..7b13600b73 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/main/resources/application.yml @@ -0,0 +1,14 @@ +server.port: 8085 +spring: + application: + name: echo +eureka: + instance: + hostname: localhost + leaseRenewalIntervalInSeconds: 1 + leaseExpirationDurationInSeconds: 2 + client: + service-url: + defaultZone: http://127.0.0.1:8761/eureka + healthcheck: + enabled: true diff --git a/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java new file mode 100644 index 0000000000..af4ba8c71a --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/echo-demo/src/test/java/com/baeldung/cloud/echo/SpringContextTest.java @@ -0,0 +1,11 @@ +package com.baeldung.cloud.echo; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +public class SpringContextTest { + @Test + void contextLoads() { + } +} diff --git a/spring-cloud/spring-cloud-netflix-sidecar/pom.xml b/spring-cloud/spring-cloud-netflix-sidecar/pom.xml new file mode 100644 index 0000000000..254a0376b6 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + com.baeldung.cloud + spring-cloud-netflix-sidecar + 0.0.1-SNAPSHOT + pom + spring-cloud-netflix-sidecar + Netflix Sidecar project for Spring Boot + + + com.baeldung + parent-boot-2 + 0.0.1-SNAPSHOT + ../../parent-boot-2 + + + sidecar-demo + echo-demo + + + 2.2.10.RELEASE + 2.3.12.RELEASE + + \ No newline at end of file diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js new file mode 100644 index 0000000000..207bd5449b --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/nodejs/hello.js @@ -0,0 +1,19 @@ +const express = require('express') +const app = express() +const port = 3000 + +app.get('/', (req, res) => { + res.send('Hello World!') +}) + +app.get('/health', (req, res) => { + res.send({ "status":"UP"}) +}) + +app.get('/hello/:me', (req, res) => { + res.send('Hello ' + req.params.me + '!') +}) + +app.listen(port, () => { + console.log(`Hello app listening on port ${port}`) +}) \ No newline at end of file diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml new file mode 100644 index 0000000000..22032d5081 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/pom.xml @@ -0,0 +1,52 @@ + + + 4.0.0 + sidecar-demo + sidecar-demo + Sidecar demo for hello endpoint + + com.baeldung.cloud + spring-cloud-netflix-sidecar + 0.0.1-SNAPSHOT + ../pom.xml + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.cloud + spring-cloud-netflix-sidecar + ${netflix.cloud.version} + + + io.projectreactor + reactor-core + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.jupiter + junit-jupiter + test + + + org.mockito + mockito-junit-jupiter + test + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java new file mode 100644 index 0000000000..83508e73d2 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/java/com/baeldung/cloud/sidecar/SidecarApplication.java @@ -0,0 +1,13 @@ +package com.baeldung.cloud.sidecar; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.sidecar.EnableSidecar; + +@SpringBootApplication +@EnableSidecar +public class SidecarApplication { + public static void main(String[] args) { + SpringApplication.run(SidecarApplication.class, args); + } +} diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml new file mode 100644 index 0000000000..29e03551c2 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/main/resources/application.yml @@ -0,0 +1,17 @@ +server.port: 8084 +spring: + application: + name: sidecar +eureka: + instance: + hostname: localhost + leaseRenewalIntervalInSeconds: 1 + leaseExpirationDurationInSeconds: 2 + client: + service-url: + defaultZone: http://127.0.0.1:8761/eureka + healthcheck: + enabled: true +sidecar: + port: 3000 + health-uri: http://localhost:3000/health diff --git a/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java new file mode 100644 index 0000000000..66f818d9b8 --- /dev/null +++ b/spring-cloud/spring-cloud-netflix-sidecar/sidecar-demo/src/test/java/com/baeldung/cloud/sidecar/SpringContextTest.java @@ -0,0 +1,11 @@ +package com.baeldung.cloud.sidecar; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +public class SpringContextTest { + @Test + void contextLoads() { + } +} From 97b2c4d6eaeae8cd426ee4bf533143027f02c5f5 Mon Sep 17 00:00:00 2001 From: ACHRAF TAITAI <43656331+achraftt@users.noreply.github.com> Date: Tue, 31 May 2022 08:21:51 +0200 Subject: [PATCH 7/7] Update spring-cloud-consul module and article (#12279) --- spring-cloud-modules/spring-cloud-consul/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-modules/spring-cloud-consul/pom.xml b/spring-cloud-modules/spring-cloud-consul/pom.xml index 52da6ff763..02823d3e07 100644 --- a/spring-cloud-modules/spring-cloud-consul/pom.xml +++ b/spring-cloud-modules/spring-cloud-consul/pom.xml @@ -55,7 +55,7 @@ - 2.2.3.RELEASE + 3.1.1 0.3.1 com.baeldung.spring.cloud.consul.discovery.DiscoveryClientApplication