From b8184f709715fb187bce120e1cdf0b6eacd466de Mon Sep 17 00:00:00 2001 From: Daniel Gstoehl Date: Wed, 16 Aug 2023 15:30:20 +0000 Subject: [PATCH] fix verifier-ws --- .../config/verifier/ws/config/VerifierWsBaseConfig.java | 6 ++++-- .../verifier/ws/controller/VerifierConfigController.java | 4 +++- .../backend/config/verifier/ws/BaseControllerTest.java | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/VerifierWsBaseConfig.java b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/VerifierWsBaseConfig.java index ed6e292..25b2ad5 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/VerifierWsBaseConfig.java +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/config/VerifierWsBaseConfig.java @@ -13,6 +13,7 @@ import ch.admin.bag.covidcertificate.backend.config.shared.helper.CheckModeInfoHelper; import ch.admin.bag.covidcertificate.backend.config.shared.helper.CovidCertNewsHelper; import ch.admin.bag.covidcertificate.backend.config.shared.helper.FaqHelper; +import ch.admin.bag.covidcertificate.backend.config.shared.helper.InfoBoxHelper; import ch.admin.bag.covidcertificate.backend.config.shared.poeditor.Messages; import ch.admin.bag.covidcertificate.backend.config.verifier.ws.controller.VerifierConfigController; import org.springframework.beans.factory.annotation.Value; @@ -31,8 +32,9 @@ public VerifierConfigController verifierConfigController( @Value("${ws.verifier.timeshiftDetection.enabled:false}") boolean timeShiftDetectionEnabled, @Value("${ws.verifier.checkModeReselectionAfterHours:48}") - int checkModeReselectionAfterHours) { + int checkModeReselectionAfterHours, + InfoBoxHelper infoBoxHelper) { return new VerifierConfigController( - messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeShiftDetectionEnabled, checkModeReselectionAfterHours); + messages, checkModeInfoHelper, faqHelper, covidCertNewsHelper, timeShiftDetectionEnabled, checkModeReselectionAfterHours, infoBoxHelper); } } diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/controller/VerifierConfigController.java b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/controller/VerifierConfigController.java index 9dafee1..27867d0 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/controller/VerifierConfigController.java +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/main/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/controller/VerifierConfigController.java @@ -54,13 +54,15 @@ public VerifierConfigController( FaqHelper faqHelper, CovidCertNewsHelper covidCertNewsHelper, boolean timeshiftDetectionEnabled, - int checkModeReselectAfterHours) { + int checkModeReselectAfterHours, + InfoBoxHelper infoBoxHelper) { this.messages = messages; this.checkModeInfoHelper = checkModeInfoHelper; this.faqHelper = faqHelper; this.covidCertNewsHelper = covidCertNewsHelper; this.timeshiftDetectionEnabled = timeshiftDetectionEnabled; this.checkModeReselectAfterHours = checkModeReselectAfterHours; + this.infoBoxHelper = infoBoxHelper; } @Documentation( diff --git a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/BaseControllerTest.java b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/BaseControllerTest.java index 9fc6d65..d06f1d2 100644 --- a/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/BaseControllerTest.java +++ b/ch-covidcertificate-backend-config/ch-covidcertificate-backend-config-verifier-ws/src/test/java/ch/admin/bag/covidcertificate/backend/config/verifier/ws/BaseControllerTest.java @@ -153,7 +153,7 @@ public void testForUpdateNote() throws Exception { .getResponse(); ConfigResponse resp = testHelper.toConfigResponse(result, acceptMediaType, TestHelper.PATH_TO_CA_PEM); - ConfigAsserter.assertNoUpdate(resp); + ConfigAsserter.assertInfoBox(resp); } @Test