From a6dd05540a144d5f51f03c08905972ec640017fb Mon Sep 17 00:00:00 2001 From: Alex Kontsur Date: Mon, 14 Oct 2024 17:29:41 +0400 Subject: [PATCH] EPA-282 --- .../1.0-SNAPSHOT/_remote.repositories | 2 +- .../lib-cetp-1.0-SNAPSHOT-sources.jar | Bin 24497 -> 24518 bytes .../1.0-SNAPSHOT/lib-cetp-1.0-SNAPSHOT.jar | Bin 55586 -> 55620 bytes .../1.0-SNAPSHOT/maven-metadata-local.xml | 8 ++++---- .../lib-cetp/maven-metadata-local.xml | 2 +- .../health/ere/ps/config/RuntimeConfig.java | 4 +--- .../ps/service/health/HealthCheckTest.java | 4 ++-- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/project-repo/de/servicehealth/lib-cetp/1.0-SNAPSHOT/_remote.repositories b/project-repo/de/servicehealth/lib-cetp/1.0-SNAPSHOT/_remote.repositories index ed503d0f..a3a86373 100644 --- a/project-repo/de/servicehealth/lib-cetp/1.0-SNAPSHOT/_remote.repositories +++ b/project-repo/de/servicehealth/lib-cetp/1.0-SNAPSHOT/_remote.repositories @@ -1,5 +1,5 @@ #NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Mon Oct 14 16:33:30 AMT 2024 +#Mon Oct 14 17:17:36 AMT 2024 lib-cetp-1.0-SNAPSHOT.jar>= lib-cetp-1.0-SNAPSHOT-sources.jar>= lib-cetp-1.0-SNAPSHOT.pom>= diff --git a/project-repo/de/servicehealth/lib-cetp/1.0-SNAPSHOT/lib-cetp-1.0-SNAPSHOT-sources.jar b/project-repo/de/servicehealth/lib-cetp/1.0-SNAPSHOT/lib-cetp-1.0-SNAPSHOT-sources.jar index 2562f16b1366f7c2d3449cd451426e6e100951be..62dbf9ef48d4bc6feab20fabdc498b6803694adc 100644 GIT binary patch delta 1266 zcmY+Dc}&x19L9gYw}=WY$RWbYQ7slMFtE@>PC@Nzk_CEK*cK*RzMz^LFn+%yTF27Ry+%Mi45#{`*t&aTLRU5(E z`4ZaD+u^NGlgCKA8R2;Z%d?IPuB8oj@oErk++;)&hj^4<7zv=aoJy}xk2*d7-8RqkNs8MW6Dn-O}{^g=^SHHxFA1 z-?k4DTc#e2q;AhBw(Qc(OSOvb>1v0$MF>UDA6h3U&5U$tWJL zyF+?58JD1tO2BD+JpUrD$c;1+Rzr9b(JjxQ(}m5^WbO;?VFZ!gqtFDx4ReZjbO z&$Ybwd&{CLf0>uy&FN*C16keJ^r;JlHW#mW-%|`%?whREmiFEvPWD6<#75Ax*>h}G zx!Dz5a1yz8?)>L*TT){0@+nD>B4D5YS=EC!xhc7wrna7axGgGdw)r0?*7M-cA%GUM2{>Le4=bB@e7%GG{U@LKt#^Fvza zurBaHw6H<0KpS70#svUOLF0z-5{zLE_qUZBB#}cktl|tO%di>9iMDT~ZeIZm(bgD- zK@P`+8yfvF2`KJ=yMZijCYUo_T+Seu1=ipePdbl{ron7p0@z^=9|1dv^64PX7Vfb1 zf&2Jm;A97Nd?(n>_d#>uEI$=&BreuOL|a%aAOmmjMLQs11ACvvQyS<5g+5r=7l(zZ zagM-)`US6mVyd+slfm&#UyubP2!lXC;1}x*-MLs;FLVSVrXG2~Vx|Q&6_G*Y7QH1v zo`{Y*z!K3;u!_A1vbP#Tyx0#FK#kZ1%EeS*8T?=1A8Z20#AGo06*+{Mz|9ge(1qw* zb}&cckNyOEC94UTf=EFbEx?_HK@hnaf_Ncc-+3i79L~nLLC<(ACyKuK*|F&uQ=bRv Uzwg%`a$fla?uZXHPU9HhzfboK0RR91 delta 1191 zcmX@MpK;@UMxFp~W)?061`Y-W{g#P5s!aMV8;v6wnM7JP_c88a1ac?)Fl&RTN@g1% zwRt?c? z2B*)iNl^yc2OEnDOrJ(QU1TA};}V+v_(cA;lw%v&R1RLeq?plW-~H_Y*T0Gl>#7rv zu1Hz6fUSu0&c*jk^(kdvj=Y;Yp=43&2JW>vN325kF&%EQOtKa4J)h4Vf1Pd3-c&cv z&>JZ)rf#3Wd)e{r`y~%tG}zVBWlr4W?V4fotHwL$eowS+k*Skv{6T|T_$kh$rj#aZ#{FMeh-U<>Anqq z(lf$*PD~GQyfwRFdy?e!N9=2qukGAE<0Jq4bqiOe3Z$0krG)GcUk^;5?R8_(n%t*C^@x^XMn5?tXh8zy6t3 z_shK|az#3?SAA}fd~(M7y4AF*qhJL zUc}Wf)4C+{*PYnqJlTu0Wh`E+?MS}Fd+7d6w#hYbPE^I56;Q9VJ~dx@Zlt@7S!Cuq zS>bRl@7e2)Y;4l{@LsdvBu@%&@ugnvM|H^%jp*2iYusWrwO@6B$@-QxMj49XFc zSBFVWz8q$<*_DUGf$4A6W`CcF%%EKG$bSZistGU!WrocGmEf$R7o@`k5{?P622nFZ zd_c0#L(&*|QL@V9sIXGTdy_AOB{K2yg0oBRg2>HqTWR)j-L~1dqD^I@2BssY^(uq-S@`cC* zM)t{uQTdD#lNUy1FxA_FCB35rC*QJ_nCu&^#iZ>B6_THv8ZJ0F%~^z-0ScBhx=(%> zoylbB0#u?fIVZ-FiNh7ljC2*Bd@n|eiOCJj_48nxY!GX~NWAcqSMPP_d{v9X7q~|j^-p6RNcRUX$*dpU)m=5{_ QMf4{xi(WT4XrBIZ97vtJ7~ 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.servicehealth lib-cetp - 20241014123324 + 20241014131730 true @@ -11,18 +11,18 @@ pom 1.0-SNAPSHOT - 20241014123324 + 20241014131730 jar 1.0-SNAPSHOT - 20241014123324 + 20241014131730 sources jar 1.0-SNAPSHOT - 20241014123324 + 20241014131730 diff --git a/project-repo/de/servicehealth/lib-cetp/maven-metadata-local.xml b/project-repo/de/servicehealth/lib-cetp/maven-metadata-local.xml index 6ca654b9..6beb5058 100644 --- a/project-repo/de/servicehealth/lib-cetp/maven-metadata-local.xml +++ b/project-repo/de/servicehealth/lib-cetp/maven-metadata-local.xml @@ -6,6 +6,6 @@ 1.0-SNAPSHOT - 20241014123324 + 20241014131730 diff --git a/src/main/java/health/ere/ps/config/RuntimeConfig.java b/src/main/java/health/ere/ps/config/RuntimeConfig.java index 0dd56af6..31d55735 100644 --- a/src/main/java/health/ere/ps/config/RuntimeConfig.java +++ b/src/main/java/health/ere/ps/config/RuntimeConfig.java @@ -107,9 +107,7 @@ public void updateConfigurationsWithHttpServletRequest(HttpServletRequest httpSe this.sendPreview = !httpServletRequest.getHeader("X-sendPreview").equalsIgnoreCase("false"); } - IUserConfigurations userConfigurations = getConfigurations(); - userConfigurations.updateWithRequest(httpServletRequest); - this.updateProperties(userConfigurations); + this.updateProperties(getConfigurations().updateWithRequest(httpServletRequest)); } public void updateConfigurationsWithJsonObject(JsonObject object) { diff --git a/src/test/java/health/ere/ps/service/health/HealthCheckTest.java b/src/test/java/health/ere/ps/service/health/HealthCheckTest.java index 5bd95522..2fc18f8d 100644 --- a/src/test/java/health/ere/ps/service/health/HealthCheckTest.java +++ b/src/test/java/health/ere/ps/service/health/HealthCheckTest.java @@ -87,8 +87,8 @@ void healthCheckWorks() { .filter(check -> check.name().equals(CETP_SERVER_CHECK)) .findFirst(); assertTrue(cetpServerCheckOpt.isPresent()); - assertThat(cetpServerCheckOpt.get().status(), equalTo("DOWN")); - assertThat(cetpServerCheckOpt.get().data().size(), equalTo(0)); + assertThat(cetpServerCheckOpt.get().status(), equalTo("UP")); + assertThat(cetpServerCheckOpt.get().data().size(), equalTo(3)); Optional statusCheckOpt = healthInfo.checks() .stream()