From 3584de39d409db954f76ed0eff316400419ef6f4 Mon Sep 17 00:00:00 2001 From: Szakalakamaka Date: Wed, 14 Oct 2020 13:40:15 +0200 Subject: [PATCH] updating cloud settings --- ...ring_cloud_config_client_2_2_5_RELEASE.xml | 13 ++ ...ing_cloud_starter_config_2_2_5_RELEASE.xml | 13 ++ .idea/workspace.xml | 118 +++++++++++------- Klaus.iml | 28 +++-- pom.xml | 5 + src/main/resources/application.properties | 9 +- target/classes/application.properties | 9 +- .../mappers/MockedMessageMapperImpl.java | 2 +- .../compile/default-compile/createdFiles.lst | 2 - .../compile/default-compile/inputFiles.lst | 2 - .../default-testCompile/createdFiles.lst | 6 - .../default-testCompile/inputFiles.lst | 6 - .../repository/EventRepositoryImplTest.class | Bin 0 -> 796 bytes .../MockedResponseRedisRepositoryTest.class | Bin 923 -> 0 bytes .../klaus/service/EtrackServiceImplTest.class | Bin 0 -> 5008 bytes .../klaus/service/KlausServiceImplTest.class | Bin 5412 -> 5412 bytes 16 files changed, 131 insertions(+), 82 deletions(-) create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_2_5_RELEASE.xml create mode 100644 .idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_2_5_RELEASE.xml delete mode 100644 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst delete mode 100644 target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst create mode 100644 target/test-classes/com/release11/klaus/repository/EventRepositoryImplTest.class delete mode 100644 target/test-classes/com/release11/klaus/repository/MockedResponseRedisRepositoryTest.class create mode 100644 target/test-classes/com/release11/klaus/service/EtrackServiceImplTest.class diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_2_5_RELEASE.xml new file mode 100644 index 0000000..22c4a13 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_config_client_2_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_2_5_RELEASE.xml b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_2_5_RELEASE.xml new file mode 100644 index 0000000..111e3fa --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_cloud_spring_cloud_starter_config_2_2_5_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index dd1c708..d4fd235 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -23,13 +23,24 @@ - + + + + + + - - - - - + + + + + + + + + + + + @@ -115,7 +127,7 @@ - + @@ -248,9 +260,9 @@ + - @@ -268,13 +280,6 @@ @@ -631,7 +643,6 @@ @@ -693,62 +705,71 @@ - + + - - + + - + + - - + + - + + - - + + - + + - - + + - + + - - + + - + + - - + + - + + - - + + - + + - - + + - + + @@ -768,21 +789,22 @@ - - + + - + - - + + + diff --git a/Klaus.iml b/Klaus.iml index d8ea2f4..9d7024e 100644 --- a/Klaus.iml +++ b/Klaus.iml @@ -29,7 +29,6 @@ - @@ -53,6 +52,21 @@ + + + + + + + + + + + + + + + @@ -110,7 +124,6 @@ - @@ -124,13 +137,6 @@ - - - - - - - @@ -151,15 +157,11 @@ - - - - diff --git a/pom.xml b/pom.xml index b96f887..cf08277 100644 --- a/pom.xml +++ b/pom.xml @@ -55,6 +55,11 @@ org.springframework.boot spring-boot-starter-validation + + org.springframework.cloud + spring-cloud-starter-config + 2.2.5.RELEASE + org.projectlombok lombok diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index adedeb4..899a830 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,7 +1,12 @@ #environment: -spring.application.name=klaus -eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/ +eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/ server.port = 8097 +spring.application.name = klaus +spring.cloud.discovery.enabled=true +spring.cloud.config.discovery.service-id = klaus-config-service +#spring.cloud.config.fail-fast=true +#spring.cloud.config.username = SpringConfigUsername +#spring.cloud.config.password = SpringConfigPassword #logging: spring.output.ansi.enabled = always logging.level.root=INFO diff --git a/target/classes/application.properties b/target/classes/application.properties index adedeb4..899a830 100644 --- a/target/classes/application.properties +++ b/target/classes/application.properties @@ -1,7 +1,12 @@ #environment: -spring.application.name=klaus -eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/ +eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/ server.port = 8097 +spring.application.name = klaus +spring.cloud.discovery.enabled=true +spring.cloud.config.discovery.service-id = klaus-config-service +#spring.cloud.config.fail-fast=true +#spring.cloud.config.username = SpringConfigUsername +#spring.cloud.config.password = SpringConfigPassword #logging: spring.output.ansi.enabled = always logging.level.root=INFO diff --git a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java index f1b594f..e706c81 100644 --- a/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java +++ b/target/generated-sources/annotations/com/release11/klaus/mappers/MockedMessageMapperImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; @Generated( value = "org.mapstruct.ap.MappingProcessor", - date = "2020-10-07T11:26:31+0200", + date = "2020-10-14T13:24:17+0200", comments = "version: 1.3.1.Final, compiler: javac, environment: Java 14.0.1 (Oracle Corporation)" ) @Component diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 4d163f9..990a1a3 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -16,7 +16,6 @@ com\release11\klaus\repository\EventRepositoryImpl.class com\release11\klaus\mappers\MockedMessageMapper.class com\release11\klaus\utilis\TrackingClient.class com\release11\klaus\config\SwaggerConfig.class -com\release11\klaus\repository\LogsRepository.class com\release11\klaus\service\EtrackServiceImpl.class com\release11\klaus\controller\MainController.class com\release11\klaus\controller\KlausMvcController.class @@ -25,7 +24,6 @@ com\release11\klaus\service\KlausService.class com\release11\klaus\service\EtrackService.class com\release11\klaus\model\MockedMessageDto.class com\release11\klaus\model\constraints\HttpCode.class -com\release11\klaus\model\MockedResponseDto.class com\release11\klaus\config\LocalDiscovery.class com\release11\klaus\model\constraints\HttpCodeValidation.class com\release11\klaus\utilis\RedisAppender.class diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 771f916..1119936 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,6 +1,5 @@ D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\MainController.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\Event.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\repository\LogsRepository.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\repository\MockedResponseRepository.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\repository\EventRepository.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\EventRequestDto.java @@ -9,7 +8,6 @@ D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\config\Lo D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\EventController.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\utilis\RedisAppender.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\constraints\HttpCodeValidation.java -D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\MockedResponseDto.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\model\constraints\HttpCode.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\repository\EventRepositoryImpl.java D:\phabricator\mockedservices-master\src\main\java\com\release11\klaus\controller\KlausController.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst deleted file mode 100644 index e1b0e5a..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst +++ /dev/null @@ -1,6 +0,0 @@ -com\release11\klaus\repository\MockedResponseRedisRepositoryTest.class -com\release11\klaus\KlausApplicationTests.class -com\release11\klaus\config\RedisConfigTest.class -com\release11\klaus\controller\KlausMvcControllerTest.class -com\release11\klaus\service\KlausServiceImplTest.class -com\release11\klaus\controller\KlausControllerTest.class diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst deleted file mode 100644 index 5b456b8..0000000 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ /dev/null @@ -1,6 +0,0 @@ -D:\phabricator\mockedservices-master\src\test\java\com\release11\klaus\controller\KlausMvcControllerTest.java -D:\phabricator\mockedservices-master\src\test\java\com\release11\klaus\repository\MockedResponseRedisRepositoryTest.java -D:\phabricator\mockedservices-master\src\test\java\com\release11\klaus\controller\KlausControllerTest.java -D:\phabricator\mockedservices-master\src\test\java\com\release11\klaus\service\KlausServiceImplTest.java -D:\phabricator\mockedservices-master\src\test\java\com\release11\klaus\KlausApplicationTests.java -D:\phabricator\mockedservices-master\src\test\java\com\release11\klaus\config\RedisConfigTest.java diff --git a/target/test-classes/com/release11/klaus/repository/EventRepositoryImplTest.class b/target/test-classes/com/release11/klaus/repository/EventRepositoryImplTest.class new file mode 100644 index 0000000000000000000000000000000000000000..40eaafc7370f2f84861cd64d0fabd9f96e7cdad3 GIT binary patch literal 796 zcmbV}-%A@o5XZk8qtR528h^ClgZiW`xcDNXA|zFz5L!^1_suy;Hs0+XdwXjCtUd`o z_y_n$iL+Nz3KE6hax*)#GoRU=d3?Hm0I-jbRg^GRL3tYEm=Ks7sB0x-WqR^QXF!n` zm^jo%`y+v|&8>C?lLEVuO{AlkR7N{H@+ww&#&&8m?XCMIPp--Mv%mJYB#kd9V^sO8 zy(EEJOB?#0CmnJZsuQzkp=Bc#x0TbuesPw4UuOb)t^X@`ATXYh|CtJWI?IjM3AJ^m zncpzRdgZk>jNfQk*OP;s-^eo6o}5&vmQCtfM<*)kGpO3t=CXJeXRMCM2yf)rNl(fh z+Z!XWJ|eQw3EfzCB|Fx7>AAR!tnqZ~ z<#`d&WPfodtf9hV4qusn9yA1|cqdtl;Q4$9@tZd#R9S{&-~%sU`cDAs8Mc5~J}ni= xU)Tz9uM%tjB#M{B8V3gK9BW|yeMtQc$U*_BzYke?1G31F5|#?NjN$!OfM;}rtT6xp literal 0 HcmV?d00001 diff --git a/target/test-classes/com/release11/klaus/repository/MockedResponseRedisRepositoryTest.class b/target/test-classes/com/release11/klaus/repository/MockedResponseRedisRepositoryTest.class deleted file mode 100644 index 54ce743ed7cf427ca0548703f2abcd2c444e2dce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 923 zcmbtT!EO^V5PeS41VW%qfkJ@;CsaVKRSpONLbM1DCBz<%L^iOzqP2Tso^9aAWr4K$|IgmH6v zM1esEu0}slML}L*dsIOls}RXA@=VT@o(E@Ts-jAaP0xxs4Sy!EIWBE9IZaG3Nk)6t zx~QUII)Nu6=ch6h-q`7}S2>+HKbHw98<;`Y6{;pd?v>G<7*8p~c3!!Z1Xf4J(z`NG z$R8<&7g!%Tt+I*ort;4=JMp7ozWuuP|B-{4hf|8@WfSPXUT7-nTlH{V;L&o8wDTn2 zvRWU!(-Z<!s6xrK687KR0usxY!@L&Y1G@E*F-YkFg@W}o-#5^xtieu9ADaS?sCmw44>J7C-9!4H$Y%e<0otGJa1 zUm?EmqJ=9wSI6MgRh|c@0a(M3Jz$+r+ja6o_Nur)5{JJf@(-vJuX13A!>={fZ14_n V9tkfbyS1qq97LLftc7D<4TjgpcOO+q3|mz$ZB$qjezq<8Lw zrY@~@t6En?ty-75R9m%H%P>$|v09gE-K|=;TK(aF|Eur0_YQMICkCF!JkQLW<=f8r z-tRl#m*@U{{%HUmcsYg&RBDLms6w?s-Lx@l#4W>4#fK)QWx^Gx-fh~ZyH}vHxn)d4 zRNyL)DCe41yvuQnxdAil#-O3H2DQ*NEYYzP%LLjJnRMKdmNc@my*+-yGIH5?Rywn0 zLdN@C$4HzQ@n`+%8EaH#sjWuNO50TuY0N-Lky`1Dp&ktyuF|m_R|_mHZ67||-zyMv z3_F=g`;&&|mJq*MBmWA#O2bMWt8k6L+H&@#Gf8R1`;-*|+CNQ+B%9%h#W>TQ3xnKPS7Qd2=;x=HThS%u0 z7S{=Ez7ksmmLvmpBd(F25$JFBucnNmD?DZtEduo^=?-QRCuDM1W@j>XRw{E_b!^5K zDmQIcI+I319x~K{y94DO%0^trv{Ri|s5OQ-wrXhCu?^ejq1Km2&&?WEP7d*EuMMm7 zK}~g@JHi$yi?7#lgR(f5uuS@2VJ3#xVwZ*vrKyuAE%Ej9R4E0G#^$2mJbA&o=dnFH z_TomOIxVwVBPIKj0zF}Sio{oV{wTTxYO}c+>5NV}(nu=ndvx?F>#JRFDT@69k^V#b zht%c)9sO#v%3^?7Q5+P|2QsOqz_4|SW>Ci=MWY3aYVCD8UXNk&d66KnVevTVjAB$^ zIWf^?S@U5L#Tf4}dnsC?c!NOeeA1>VBil3~rQJmG+)Pt8mq_puCv%oHM{C#MsEVv( z0_*(HDf*xcq@%cn_AsoaE9WbT;x>WRgT8Z`wrwjZb!0j-E0b-tFfgGZp(6=mHC>yjJ}qMGXbdS#X)sl~nHFeSBxZ-@9XaN}UN=k#*Fmr@r6Zpo|#qZy zv%;x#lxMspFt7~c|HV=Zb2{!)y6flZ-tT16%Ca}bi5t!;8l9>Zb=*Cak2NVMC?g=myY}J?vkXLOxAQW&K%#) zvXUHGr0`$c;fr%3;=Q#!M|v;UgMO>-Z=>CeT(cC>A!2Z^NW%C%u=Rsz(-v+ky{ls3@U1 z#iz)NsG!Js0H4tCNgbcUgDkefhgaE)m%zM!a!T3)9brrr^Ugq+BkSfSCiud}hwM~_ zzazoCvlgGhXEl6I$3sfZ#>-*i>0Rm_WM3rF*VeTy@#W?p)Tincok}Ir?i)b6KN8HD3tS;qo!? z%-8XlhHvP29N%QpS64P=q!SLacD#f~jW5@Tc^6-cm8vo*N5#WFfioKNI?kdXu&NwU zSC+?R5gIeR!RVC1NoyI8msim;7Q+KLuj5I4n?=E_bj(S{$ztVDfFi~Fw2trK0^fcf zP*Qhe^RZCfRD>H}^p(RoTV>oaGiy#*vdgwJuHl+21O*!A!BGL2Wz@=fi~Y9hG}Km> zdo?3w$~K5FUf}jnuqYSoUd(-+dnqB(!y2B6Xn>wSluJ*rNHS=aXA4X3F~c#{JXnml zQzq@)URLyifK%NHRaNm~4zr-H%H_;t`}~&0dmn?XZS;VbVM(*DtfmkKDc2{y$hEz= zvV%bP?ru8ArYt_4n=x5i$Bh{?-Yq9Hj_flMQ{>m_GOrN#tCU8s=eT(AxtZeOS1%we zI9}A1hSQrl$yBp$0m`mP8W3oWjbw68Lhd)!Wv?pR;kBt`%>HEoY4T22+F2qe-ls;% zann`Dsq(7%B3tn(n12UBZuIz+1a%Ajwk@3=O9c>Jtb6$(sE!C{Z(0iYV1rd z!Vh0G2z-~LYW_aMU#N^1TKk^2#y8aaW#7xa?{i#%XFUmQtGV(6uIxo6M?l@Cvk;q} zgm&aCYR(|`xJUg%eye62EEXdyynn=z?$hJPc#bpRCzMs8WK~Qe%7z=Fx4$R8bYU*k#D+^ei$NGlmJT|o!(3Z!JdeKwB&OCNE?8~FOp)Ze{8g9;GAdjI#9_K%z zRdq}18UxM|a&GoHU&+uB@j0ri>gwwBfaCE0)-~?y>ZtNrBURN}w16YZ%Ht(YrT-Em zZw(l$H$8#amUFnh0^@49G7=hBg~rvvxPZylJWdoalZRWcy{I(SReL(`EZ)W&^SJvA z?k(N_GuX;ozK-|b%=_KM|1z{#m;6L%$!YwGqblkbq=5Qo%VUo?#<)jfmW@6uNCkupZDAa zoC@*!a(oHn$~Bcxp|Ogpf!nd3{a7;+y!a$`V-mOW!d0j=`sM^j-a*Ix)(gcKxTnI% zUwM|JVle-XJHYQR9%&bkq{4Gqeuv)Cd=Fs=8gm{irA{N^lID-Z3}fs@*ppdDrmL+E&-m1&{2J> KrghcKYWxGY)h!VK