diff --git a/.idea/runConfigurations/accredited_programmes_and_oasys.run.xml b/.idea/runConfigurations/accredited_programmes_and_oasys.run.xml index bf7bbc1897..b3febc844f 100644 --- a/.idea/runConfigurations/accredited_programmes_and_oasys.run.xml +++ b/.idea/runConfigurations/accredited_programmes_and_oasys.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/appointment_reminders_and_delius.run.xml b/.idea/runConfigurations/appointment_reminders_and_delius.run.xml index e2cfe07e16..eeca3fe9bf 100644 --- a/.idea/runConfigurations/appointment_reminders_and_delius.run.xml +++ b/.idea/runConfigurations/appointment_reminders_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/approved_premises_and_delius.run.xml b/.idea/runConfigurations/approved_premises_and_delius.run.xml index a87527aa98..6d129dcc24 100644 --- a/.idea/runConfigurations/approved_premises_and_delius.run.xml +++ b/.idea/runConfigurations/approved_premises_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/approved_premises_and_oasys.run.xml b/.idea/runConfigurations/approved_premises_and_oasys.run.xml index e3b0fe3af6..07997e2045 100644 --- a/.idea/runConfigurations/approved_premises_and_oasys.run.xml +++ b/.idea/runConfigurations/approved_premises_and_oasys.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/arns_and_delius.run.xml b/.idea/runConfigurations/arns_and_delius.run.xml index a579830fe2..855d855e6b 100644 --- a/.idea/runConfigurations/arns_and_delius.run.xml +++ b/.idea/runConfigurations/arns_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/assess-for-early-release-and-delius.run.xml b/.idea/runConfigurations/assess-for-early-release-and-delius.run.xml index 80e0aa569f..a79eb82075 100644 --- a/.idea/runConfigurations/assess-for-early-release-and-delius.run.xml +++ b/.idea/runConfigurations/assess-for-early-release-and-delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/assessment_summary_and_delius.run.xml b/.idea/runConfigurations/assessment_summary_and_delius.run.xml index 810393bf40..e917bd52b9 100644 --- a/.idea/runConfigurations/assessment_summary_and_delius.run.xml +++ b/.idea/runConfigurations/assessment_summary_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/cas2_and_delius.run.xml b/.idea/runConfigurations/cas2_and_delius.run.xml index e1c9faec50..742dbf949d 100644 --- a/.idea/runConfigurations/cas2_and_delius.run.xml +++ b/.idea/runConfigurations/cas2_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/cas3_and_delius.run.xml b/.idea/runConfigurations/cas3_and_delius.run.xml index 6d4e5dabb6..d779034e83 100644 --- a/.idea/runConfigurations/cas3_and_delius.run.xml +++ b/.idea/runConfigurations/cas3_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/common_platform_and_delius.run.xml b/.idea/runConfigurations/common_platform_and_delius.run.xml index 4274fea1ee..c7d99de3db 100644 --- a/.idea/runConfigurations/common_platform_and_delius.run.xml +++ b/.idea/runConfigurations/common_platform_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/core_person_record_and_delius.run.xml b/.idea/runConfigurations/core_person_record_and_delius.run.xml index 3ddceaed5c..2a4fbc7e41 100644 --- a/.idea/runConfigurations/core_person_record_and_delius.run.xml +++ b/.idea/runConfigurations/core_person_record_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/court_case_and_delius.run.xml b/.idea/runConfigurations/court_case_and_delius.run.xml index e2e705ea25..9245950a4c 100644 --- a/.idea/runConfigurations/court_case_and_delius.run.xml +++ b/.idea/runConfigurations/court_case_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/create_and_vary_a_licence_and_delius.run.xml b/.idea/runConfigurations/create_and_vary_a_licence_and_delius.run.xml index 27ac3418f9..46d6bcacbf 100644 --- a/.idea/runConfigurations/create_and_vary_a_licence_and_delius.run.xml +++ b/.idea/runConfigurations/create_and_vary_a_licence_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/custody_key_dates_and_delius.run.xml b/.idea/runConfigurations/custody_key_dates_and_delius.run.xml index 302d699cce..3bd30fe154 100644 --- a/.idea/runConfigurations/custody_key_dates_and_delius.run.xml +++ b/.idea/runConfigurations/custody_key_dates_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/domain_events_and_delius.run.xml b/.idea/runConfigurations/domain_events_and_delius.run.xml index 8a6ea5dd09..cd5902e594 100644 --- a/.idea/runConfigurations/domain_events_and_delius.run.xml +++ b/.idea/runConfigurations/domain_events_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/dps_and_delius.run.xml b/.idea/runConfigurations/dps_and_delius.run.xml index a28166adf1..2ca8940ac7 100644 --- a/.idea/runConfigurations/dps_and_delius.run.xml +++ b/.idea/runConfigurations/dps_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/effective_proposal_framework_and_delius.run.xml b/.idea/runConfigurations/effective_proposal_framework_and_delius.run.xml index 67d920489c..895984f9a6 100644 --- a/.idea/runConfigurations/effective_proposal_framework_and_delius.run.xml +++ b/.idea/runConfigurations/effective_proposal_framework_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/external_api_and_delius.run.xml b/.idea/runConfigurations/external_api_and_delius.run.xml index 0262a01409..e17228d3e0 100644 --- a/.idea/runConfigurations/external_api_and_delius.run.xml +++ b/.idea/runConfigurations/external_api_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/hdc_licences_and_delius.run.xml b/.idea/runConfigurations/hdc_licences_and_delius.run.xml index 781e2dfec1..97a08a2548 100644 --- a/.idea/runConfigurations/hdc_licences_and_delius.run.xml +++ b/.idea/runConfigurations/hdc_licences_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/hmpps_auth_and_delius.run.xml b/.idea/runConfigurations/hmpps_auth_and_delius.run.xml index 150b08fc88..94c0982430 100644 --- a/.idea/runConfigurations/hmpps_auth_and_delius.run.xml +++ b/.idea/runConfigurations/hmpps_auth_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/ims_and_delius.run.xml b/.idea/runConfigurations/ims_and_delius.run.xml index 88c0fdb739..0a3c918a56 100644 --- a/.idea/runConfigurations/ims_and_delius.run.xml +++ b/.idea/runConfigurations/ims_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/justice_email_and_delius.run.xml b/.idea/runConfigurations/justice_email_and_delius.run.xml index c8608046b1..8a34c622bf 100644 --- a/.idea/runConfigurations/justice_email_and_delius.run.xml +++ b/.idea/runConfigurations/justice_email_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/make_recall_decisions_and_delius.run.xml b/.idea/runConfigurations/make_recall_decisions_and_delius.run.xml index 3206d17862..3b8bf99081 100644 --- a/.idea/runConfigurations/make_recall_decisions_and_delius.run.xml +++ b/.idea/runConfigurations/make_recall_decisions_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/manage_offences_and_delius.run.xml b/.idea/runConfigurations/manage_offences_and_delius.run.xml index f1a72cee3f..9227db5a0d 100644 --- a/.idea/runConfigurations/manage_offences_and_delius.run.xml +++ b/.idea/runConfigurations/manage_offences_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/manage_pom_cases_and_delius.run.xml b/.idea/runConfigurations/manage_pom_cases_and_delius.run.xml index c935693fc3..ab174b9a06 100644 --- a/.idea/runConfigurations/manage_pom_cases_and_delius.run.xml +++ b/.idea/runConfigurations/manage_pom_cases_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/manage_supervision_and_delius.run.xml b/.idea/runConfigurations/manage_supervision_and_delius.run.xml index a7c2d1a87f..dfdf506c34 100644 --- a/.idea/runConfigurations/manage_supervision_and_delius.run.xml +++ b/.idea/runConfigurations/manage_supervision_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/manage_supervision_and_oasys.run.xml b/.idea/runConfigurations/manage_supervision_and_oasys.run.xml index 7381628cde..494e1ea91b 100644 --- a/.idea/runConfigurations/manage_supervision_and_oasys.run.xml +++ b/.idea/runConfigurations/manage_supervision_and_oasys.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/oasys_and_delius.run.xml b/.idea/runConfigurations/oasys_and_delius.run.xml index ad218f51ec..f94140cfb6 100644 --- a/.idea/runConfigurations/oasys_and_delius.run.xml +++ b/.idea/runConfigurations/oasys_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/offender_events_and_delius.run.xml b/.idea/runConfigurations/offender_events_and_delius.run.xml index 2cdefe3240..fdb9cb9945 100644 --- a/.idea/runConfigurations/offender_events_and_delius.run.xml +++ b/.idea/runConfigurations/offender_events_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/opd_and_delius.run.xml b/.idea/runConfigurations/opd_and_delius.run.xml index d639900072..dd3784ecbb 100644 --- a/.idea/runConfigurations/opd_and_delius.run.xml +++ b/.idea/runConfigurations/opd_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/pathfinder_and_delius.run.xml b/.idea/runConfigurations/pathfinder_and_delius.run.xml index 258ed1a5da..0c05443826 100644 --- a/.idea/runConfigurations/pathfinder_and_delius.run.xml +++ b/.idea/runConfigurations/pathfinder_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/pre_sentence_reports_to_delius.run.xml b/.idea/runConfigurations/pre_sentence_reports_to_delius.run.xml index 6baba08dd5..eab397509d 100644 --- a/.idea/runConfigurations/pre_sentence_reports_to_delius.run.xml +++ b/.idea/runConfigurations/pre_sentence_reports_to_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/prison_case_notes_to_probation.run.xml b/.idea/runConfigurations/prison_case_notes_to_probation.run.xml index 64d2461698..969e56e034 100644 --- a/.idea/runConfigurations/prison_case_notes_to_probation.run.xml +++ b/.idea/runConfigurations/prison_case_notes_to_probation.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/prison_custody_status_to_delius.run.xml b/.idea/runConfigurations/prison_custody_status_to_delius.run.xml index c2ccf609ee..f30e649f1e 100644 --- a/.idea/runConfigurations/prison_custody_status_to_delius.run.xml +++ b/.idea/runConfigurations/prison_custody_status_to_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/prison_education_and_delius.run.xml b/.idea/runConfigurations/prison_education_and_delius.run.xml index 98f006e1cd..08e6090868 100644 --- a/.idea/runConfigurations/prison_education_and_delius.run.xml +++ b/.idea/runConfigurations/prison_education_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/prison_identifier_and_delius.run.xml b/.idea/runConfigurations/prison_identifier_and_delius.run.xml index 14bf2279a0..2addd2dcf6 100644 --- a/.idea/runConfigurations/prison_identifier_and_delius.run.xml +++ b/.idea/runConfigurations/prison_identifier_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/prisoner_profile_and_delius.run.xml b/.idea/runConfigurations/prisoner_profile_and_delius.run.xml index 64e4dd5721..fe7d9531d9 100644 --- a/.idea/runConfigurations/prisoner_profile_and_delius.run.xml +++ b/.idea/runConfigurations/prisoner_profile_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/probation_search_and_delius.run.xml b/.idea/runConfigurations/probation_search_and_delius.run.xml index cec87429f9..73b7944d23 100644 --- a/.idea/runConfigurations/probation_search_and_delius.run.xml +++ b/.idea/runConfigurations/probation_search_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/refer_and_monitor_and_delius.run.xml b/.idea/runConfigurations/refer_and_monitor_and_delius.run.xml index 92b961f7aa..b0eb2891a9 100644 --- a/.idea/runConfigurations/refer_and_monitor_and_delius.run.xml +++ b/.idea/runConfigurations/refer_and_monitor_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/resettlement_passport_and_delius.run.xml b/.idea/runConfigurations/resettlement_passport_and_delius.run.xml index 5b5ea06437..fe316e2601 100644 --- a/.idea/runConfigurations/resettlement_passport_and_delius.run.xml +++ b/.idea/runConfigurations/resettlement_passport_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/risk_assessment_scores_to_delius.run.xml b/.idea/runConfigurations/risk_assessment_scores_to_delius.run.xml index 58728c3325..89096167ce 100644 --- a/.idea/runConfigurations/risk_assessment_scores_to_delius.run.xml +++ b/.idea/runConfigurations/risk_assessment_scores_to_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/sentence_plan_and_delius.run.xml b/.idea/runConfigurations/sentence_plan_and_delius.run.xml index 48d60bb7ad..0de21fe417 100644 --- a/.idea/runConfigurations/sentence_plan_and_delius.run.xml +++ b/.idea/runConfigurations/sentence_plan_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/sentence_plan_and_oasys.run.xml b/.idea/runConfigurations/sentence_plan_and_oasys.run.xml index c7e58f08d5..ab0f9f00f4 100644 --- a/.idea/runConfigurations/sentence_plan_and_oasys.run.xml +++ b/.idea/runConfigurations/sentence_plan_and_oasys.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/soc_and_delius.run.xml b/.idea/runConfigurations/soc_and_delius.run.xml index b6d911b0a1..c54e3a9400 100644 --- a/.idea/runConfigurations/soc_and_delius.run.xml +++ b/.idea/runConfigurations/soc_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/subject_access_requests_and_delius.run.xml b/.idea/runConfigurations/subject_access_requests_and_delius.run.xml index 1136ecbc65..0e327ccb2e 100644 --- a/.idea/runConfigurations/subject_access_requests_and_delius.run.xml +++ b/.idea/runConfigurations/subject_access_requests_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/tier_to_delius.run.xml b/.idea/runConfigurations/tier_to_delius.run.xml index d9b97282d3..e2d4cf4b87 100644 --- a/.idea/runConfigurations/tier_to_delius.run.xml +++ b/.idea/runConfigurations/tier_to_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/unpaid_work_and_delius.run.xml b/.idea/runConfigurations/unpaid_work_and_delius.run.xml index 20fbe345a8..c0819f2b0f 100644 --- a/.idea/runConfigurations/unpaid_work_and_delius.run.xml +++ b/.idea/runConfigurations/unpaid_work_and_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/.idea/runConfigurations/workforce_allocations_to_delius.run.xml b/.idea/runConfigurations/workforce_allocations_to_delius.run.xml index b627aac06c..9f408787d4 100644 --- a/.idea/runConfigurations/workforce_allocations_to_delius.run.xml +++ b/.idea/runConfigurations/workforce_allocations_to_delius.run.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file diff --git a/libs/commons/src/main/kotlin/uk/gov/justice/digital/hmpps/config/BuildInfoConfig.kt b/libs/commons/src/main/kotlin/uk/gov/justice/digital/hmpps/config/BuildInfoConfig.kt index 9ef8415c32..256232c919 100644 --- a/libs/commons/src/main/kotlin/uk/gov/justice/digital/hmpps/config/BuildInfoConfig.kt +++ b/libs/commons/src/main/kotlin/uk/gov/justice/digital/hmpps/config/BuildInfoConfig.kt @@ -1,6 +1,7 @@ package uk.gov.justice.digital.hmpps.config import org.springframework.beans.factory.annotation.Value +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty import org.springframework.boot.info.BuildProperties import org.springframework.boot.info.GitProperties import org.springframework.context.annotation.Bean @@ -15,10 +16,12 @@ import java.util.* @Configuration class BuildInfoConfig { @Bean + @ConditionalOnProperty("build.info") fun buildProperties(@Value("\${build.info:#{null}}") info: String?) = info?.let { BuildProperties(loadFrom(it, "build.")) } @Bean + @ConditionalOnProperty("git.info") fun gitProperties(@Value("\${git.info:#{null}}") info: String?) = info?.let { GitProperties(loadFrom(it, "git.")) } diff --git a/libs/dev-tools/src/main/kotlin/uk/gov/justice/digital/hmpps/test/MockMvcExtensions.kt b/libs/dev-tools/src/main/kotlin/uk/gov/justice/digital/hmpps/test/MockMvcExtensions.kt index 05740a7ca9..2d46599fcc 100644 --- a/libs/dev-tools/src/main/kotlin/uk/gov/justice/digital/hmpps/test/MockMvcExtensions.kt +++ b/libs/dev-tools/src/main/kotlin/uk/gov/justice/digital/hmpps/test/MockMvcExtensions.kt @@ -11,6 +11,7 @@ import com.fasterxml.jackson.module.kotlin.readValue import org.springframework.http.HttpHeaders import org.springframework.http.MediaType import org.springframework.mock.web.MockHttpServletResponse +import org.springframework.test.json.JsonCompareMode import org.springframework.test.web.servlet.ResultActions import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder import org.springframework.test.web.servlet.result.MockMvcResultMatchers.content @@ -37,7 +38,7 @@ object MockMvcExtensions { inline fun MockHttpServletResponse.contentAsJson(): T = objectMapper.readValue(this.contentAsString) - inline fun ResultActions.andExpectJson(obj: T, strict: Boolean = false) = + inline fun ResultActions.andExpectJson(obj: T, compareMode: JsonCompareMode = JsonCompareMode.LENIENT) = this.andExpect(header().string(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)) - .andExpect(content().json(objectMapper.writeValueAsString(obj), strict)) + .andExpect(content().json(objectMapper.writeValueAsString(obj), compareMode)) } diff --git a/libs/dev-tools/src/main/kotlin/uk/gov/justice/digital/hmpps/wiremock/WireMockInitialiser.kt b/libs/dev-tools/src/main/kotlin/uk/gov/justice/digital/hmpps/wiremock/WireMockInitialiser.kt index aaaaa89bc8..11603172a4 100644 --- a/libs/dev-tools/src/main/kotlin/uk/gov/justice/digital/hmpps/wiremock/WireMockInitialiser.kt +++ b/libs/dev-tools/src/main/kotlin/uk/gov/justice/digital/hmpps/wiremock/WireMockInitialiser.kt @@ -17,6 +17,9 @@ class WireMockInitialiser : ApplicationContextInitializer throw RuntimeException("Failed to download document. Alfresco responded with ${res.statusCode}.") } - }, false) + }, false) ?: throw NotFoundException("Document content", "alfrescoId", id) private fun HttpHeaders.copy(key: String, res: ConvertibleClientHttpResponse) { res.headers[key]?.also { this[key] = it } diff --git a/libs/document-management/src/main/kotlin/uk/gov/justice/digital/hmpps/config/security/StreamingHeadersSecurityConfigurer.kt b/libs/document-management/src/main/kotlin/uk/gov/justice/digital/hmpps/config/security/StreamingHeadersSecurityConfigurer.kt index 236e914182..4e567f9ba8 100644 --- a/libs/document-management/src/main/kotlin/uk/gov/justice/digital/hmpps/config/security/StreamingHeadersSecurityConfigurer.kt +++ b/libs/document-management/src/main/kotlin/uk/gov/justice/digital/hmpps/config/security/StreamingHeadersSecurityConfigurer.kt @@ -1,7 +1,7 @@ package uk.gov.justice.digital.hmpps.config.security import org.springframework.context.annotation.Configuration -import org.springframework.security.config.annotation.ObjectPostProcessor +import org.springframework.security.config.ObjectPostProcessor import org.springframework.security.config.annotation.web.builders.HttpSecurity import org.springframework.security.web.header.HeaderWriterFilter diff --git a/projects/accredited-programmes-and-oasys/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/accredited-programmes-and-oasys/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index 5435332782..63ef10ff35 100644 --- a/projects/accredited-programmes-and-oasys/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/accredited-programmes-and-oasys/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status @@ -25,7 +25,7 @@ internal class IntegrationTest { @Autowired lateinit var mockMvc: MockMvc - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/projects/accredited-programmes-and-oasys/src/main/resources/application.yml b/projects/accredited-programmes-and-oasys/src/main/resources/application.yml index 51d54b512f..e61c850196 100644 --- a/projects/accredited-programmes-and-oasys/src/main/resources/application.yml +++ b/projects/accredited-programmes-and-oasys/src/main/resources/application.yml @@ -1,5 +1,4 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_empty @@ -35,7 +34,7 @@ info.productId: HMPPS518 # https://developer-portal.hmpps.service.justice.gov.uk spring.config.activate.on-profile: [ "dev", "integration-test" ] server.shutdown: immediate -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser +wiremock.enabled: true integrations: ords: diff --git a/projects/appointment-reminders-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/appointment-reminders-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index 3f8875a303..daccaf819d 100644 --- a/projects/appointment-reminders-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/appointment-reminders-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get import org.springframework.test.web.servlet.result.MockMvcResultMatchers.content @@ -30,13 +30,13 @@ internal class IntegrationTest { @Autowired lateinit var unpaidWorkAppointmentsService: UnpaidWorkAppointmentsService - @MockBean + @MockitoBean lateinit var upwAppointmentRepository: UpwAppointmentRepository - @MockBean + @MockitoBean lateinit var notificationClient: NotificationClient - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/projects/appointment-reminders-and-delius/src/main/resources/application.yml b/projects/appointment-reminders-and-delius/src/main/resources/application.yml index dcccd3a6b6..be764b5b6a 100644 --- a/projects/appointment-reminders-and-delius/src/main/resources/application.yml +++ b/projects/appointment-reminders-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -47,7 +45,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser govuk-notify.api-key: test diff --git a/projects/approved-premises-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MessagingIntegrationInactiveTest.kt b/projects/approved-premises-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MessagingIntegrationInactiveTest.kt index 6c2cf40881..bbc2fcd58e 100644 --- a/projects/approved-premises-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MessagingIntegrationInactiveTest.kt +++ b/projects/approved-premises-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MessagingIntegrationInactiveTest.kt @@ -16,18 +16,16 @@ import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.* import uk.gov.justice.digital.hmpps.datetime.EuropeLondon import uk.gov.justice.digital.hmpps.integrations.approvedpremises.EventDetails import uk.gov.justice.digital.hmpps.integrations.approvedpremises.PersonArrived import uk.gov.justice.digital.hmpps.integrations.approvedpremises.PersonDeparted -import uk.gov.justice.digital.hmpps.integrations.delius.approvedpremises.referral.entity.PreferredResidence import uk.gov.justice.digital.hmpps.integrations.delius.approvedpremises.referral.entity.PreferredResidenceRepository import uk.gov.justice.digital.hmpps.integrations.delius.approvedpremises.referral.entity.ReferralRepository import uk.gov.justice.digital.hmpps.integrations.delius.approvedpremises.referral.entity.ResidenceRepository import uk.gov.justice.digital.hmpps.integrations.delius.contact.ContactRepository -import uk.gov.justice.digital.hmpps.integrations.delius.contact.outcome.ContactOutcome import uk.gov.justice.digital.hmpps.integrations.delius.contact.type.ContactTypeCode import uk.gov.justice.digital.hmpps.integrations.delius.nonstatutoryintervention.entity.Nsi.Companion.EXT_REF_BOOKING_PREFIX import uk.gov.justice.digital.hmpps.integrations.delius.nonstatutoryintervention.entity.NsiRepository @@ -66,7 +64,7 @@ internal class MessagingIntegrationInactiveTest { @Autowired lateinit var personAddressRepository: PersonAddressRepository - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Autowired diff --git a/projects/approved-premises-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MessagingIntegrationTest.kt b/projects/approved-premises-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MessagingIntegrationTest.kt index f0f683716e..d225ebf65d 100644 --- a/projects/approved-premises-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MessagingIntegrationTest.kt +++ b/projects/approved-premises-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MessagingIntegrationTest.kt @@ -17,7 +17,7 @@ import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.* import uk.gov.justice.digital.hmpps.datetime.EuropeLondon import uk.gov.justice.digital.hmpps.integrations.approvedpremises.EventDetails @@ -71,7 +71,7 @@ internal class MessagingIntegrationTest { @Autowired lateinit var personAddressRepository: PersonAddressRepository - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Autowired diff --git a/projects/approved-premises-and-delius/src/main/resources/application.yml b/projects/approved-premises-and-delius/src/main/resources/application.yml index 0cb9bb95cd..746e313e16 100644 --- a/projects/approved-premises-and-delius/src/main/resources/application.yml +++ b/projects/approved-premises-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -62,7 +60,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: message-queue messaging.producer.topic: domain-events diff --git a/projects/approved-premises-and-oasys/src/main/resources/application.yml b/projects/approved-premises-and-oasys/src/main/resources/application.yml index 8ed800626e..57b1a91cdb 100644 --- a/projects/approved-premises-and-oasys/src/main/resources/application.yml +++ b/projects/approved-premises-and-oasys/src/main/resources/application.yml @@ -1,5 +1,4 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_empty @@ -37,7 +36,6 @@ spring.config.activate.on-profile: [ "dev", "integration-test" ] server.shutdown: immediate wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser ords: client-id: approved-premises-and-oasys diff --git a/projects/arns-and-delius/src/main/resources/application.yml b/projects/arns-and-delius/src/main/resources/application.yml index 84cc96ef46..3dd2b97f33 100644 --- a/projects/arns-and-delius/src/main/resources/application.yml +++ b/projects/arns-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -44,7 +42,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/assess-for-early-release-and-delius/src/main/resources/application.yml b/projects/assess-for-early-release-and-delius/src/main/resources/application.yml index 0a4dd92c9e..2d3517d7da 100644 --- a/projects/assess-for-early-release-and-delius/src/main/resources/application.yml +++ b/projects/assess-for-early-release-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -51,7 +49,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/assessment-summary-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/assessment-summary-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index 796d2d5b9f..0425b3afb8 100644 --- a/projects/assessment-summary-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/assessment-summary-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -14,7 +14,7 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.transaction.PlatformTransactionManager import org.springframework.transaction.support.TransactionTemplate import uk.gov.justice.digital.hmpps.data.entity.IapsPersonRepository @@ -63,7 +63,7 @@ internal class IntegrationTest { @Autowired lateinit var transactionManager: PlatformTransactionManager - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService lateinit var transactionTemplate: TransactionTemplate diff --git a/projects/assessment-summary-and-delius/src/main/resources/application.yml b/projects/assessment-summary-and-delius/src/main/resources/application.yml index 9800eec564..f0e53b7db7 100644 --- a/projects/assessment-summary-and-delius/src/main/resources/application.yml +++ b/projects/assessment-summary-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -49,7 +47,7 @@ spring: jpa.hibernate.ddl-auto: create-drop seed.database: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser +wiremock.enabled: true messaging.consumer.queue: message-queue diff --git a/projects/cas2-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/cas2-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index ebc1c47a6b..fd67870454 100644 --- a/projects/cas2-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/cas2-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -11,9 +11,9 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean import org.springframework.boot.test.system.CapturedOutput import org.springframework.boot.test.system.OutputCaptureExtension +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.datetime.EuropeLondon import uk.gov.justice.digital.hmpps.entity.ContactRepository import uk.gov.justice.digital.hmpps.entity.ContactType.Companion.REFERRAL_SUBMITTED @@ -39,7 +39,7 @@ internal class IntegrationTest { @Autowired lateinit var contactRepository: ContactRepository - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/projects/cas2-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/NotFoundIntegrationTest.kt b/projects/cas2-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/NotFoundIntegrationTest.kt index f2ec89edff..888871160f 100644 --- a/projects/cas2-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/NotFoundIntegrationTest.kt +++ b/projects/cas2-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/NotFoundIntegrationTest.kt @@ -12,9 +12,9 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean import org.springframework.boot.test.system.CapturedOutput import org.springframework.boot.test.system.OutputCaptureExtension +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.messaging.HmppsChannelManager import uk.gov.justice.digital.hmpps.telemetry.TelemetryService @@ -30,7 +30,7 @@ internal class NotFoundIntegrationTest { @Autowired lateinit var wireMockServer: WireMockServer - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/projects/cas2-and-delius/src/main/resources/application.yml b/projects/cas2-and-delius/src/main/resources/application.yml index 89d62acd7f..a964575265 100644 --- a/projects/cas2-and-delius/src/main/resources/application.yml +++ b/projects/cas2-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -50,7 +48,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: message-queue diff --git a/projects/cas3-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CASIntegrationTest.kt b/projects/cas3-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CASIntegrationTest.kt index e33016b105..eca9212329 100644 --- a/projects/cas3-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CASIntegrationTest.kt +++ b/projects/cas3-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CASIntegrationTest.kt @@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.ProviderGenerator import uk.gov.justice.digital.hmpps.datetime.DeliusDateTimeFormatter import uk.gov.justice.digital.hmpps.datetime.EuropeLondon @@ -56,7 +56,7 @@ internal class CASIntegrationTest { @Autowired lateinit var personRepository: PersonRepository - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Autowired diff --git a/projects/cas3-and-delius/src/main/resources/application.yml b/projects/cas3-and-delius/src/main/resources/application.yml index 6675ac92f7..8e5dce7357 100644 --- a/projects/cas3-and-delius/src/main/resources/application.yml +++ b/projects/cas3-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -50,7 +48,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: message-queue messaging.producer.topic: domain-events diff --git a/projects/common-platform-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/common-platform-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index 6276947a5a..0fe0dc3ba7 100644 --- a/projects/common-platform-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/common-platform-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -13,8 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean -import org.springframework.boot.test.mock.mockito.SpyBean +import org.springframework.test.context.bean.override.mockito.MockitoBean +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean import uk.gov.justice.digital.hmpps.audit.entity.AuditedInteraction import uk.gov.justice.digital.hmpps.audit.service.AuditedInteractionService import uk.gov.justice.digital.hmpps.data.generator.MessageGenerator @@ -51,19 +51,19 @@ internal class IntegrationTest { @Autowired lateinit var wireMockServer: WireMockServer - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService - @SpyBean + @MockitoSpyBean lateinit var auditedInteractionService: AuditedInteractionService - @SpyBean + @MockitoSpyBean lateinit var personRepository: PersonRepository - @SpyBean + @MockitoSpyBean lateinit var addressRepository: PersonAddressRepository - @SpyBean + @MockitoSpyBean lateinit var personService: PersonService @BeforeEach diff --git a/projects/common-platform-and-delius/src/main/resources/application.yml b/projects/common-platform-and-delius/src/main/resources/application.yml index 400dd58880..da687f9b77 100644 --- a/projects/common-platform-and-delius/src/main/resources/application.yml +++ b/projects/common-platform-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -53,7 +51,6 @@ messaging.producer.topic: domain-events seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: message-queue diff --git a/projects/core-person-record-and-delius/src/main/resources/application.yml b/projects/core-person-record-and-delius/src/main/resources/application.yml index abdc991a32..4664ebdea3 100644 --- a/projects/core-person-record-and-delius/src/main/resources/application.yml +++ b/projects/core-person-record-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE diff --git a/projects/court-case-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CourtCaseNotesIntegrationTest.kt b/projects/court-case-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CourtCaseNotesIntegrationTest.kt index 17b0e90e66..44e7e4489e 100644 --- a/projects/court-case-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CourtCaseNotesIntegrationTest.kt +++ b/projects/court-case-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CourtCaseNotesIntegrationTest.kt @@ -11,8 +11,8 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean -import org.springframework.boot.test.mock.mockito.SpyBean +import org.springframework.test.context.bean.override.mockito.MockitoBean +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean import uk.gov.justice.digital.hmpps.audit.repository.AuditedInteractionRepository import uk.gov.justice.digital.hmpps.data.generator.CourtCaseNoteMessageGenerator import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator @@ -35,13 +35,13 @@ class CaseNotesIntegrationTest { @Autowired private lateinit var caseNoteRepository: CaseNoteRepository - @MockBean + @MockitoBean private lateinit var telemetryService: TelemetryService @Autowired lateinit var wireMockserver: WireMockServer - @SpyBean + @MockitoSpyBean lateinit var air: AuditedInteractionRepository @Test diff --git a/projects/court-case-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/court-case-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index fc748a6b32..5ef510d4f9 100644 --- a/projects/court-case-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/court-case-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get import org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath @@ -29,7 +29,7 @@ internal class IntegrationTest { @Autowired lateinit var wireMockServer: WireMockServer - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @ParameterizedTest diff --git a/projects/court-case-and-delius/src/main/resources/application.yml b/projects/court-case-and-delius/src/main/resources/application.yml index 645c0db0b9..046741629c 100644 --- a/projects/court-case-and-delius/src/main/resources/application.yml +++ b/projects/court-case-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -65,7 +63,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: events diff --git a/projects/create-and-vary-a-licence-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/LicenceActivatedIntegrationTest.kt b/projects/create-and-vary-a-licence-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/LicenceActivatedIntegrationTest.kt index b72960b636..0bfd2d1494 100644 --- a/projects/create-and-vary-a-licence-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/LicenceActivatedIntegrationTest.kt +++ b/projects/create-and-vary-a-licence-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/LicenceActivatedIntegrationTest.kt @@ -9,7 +9,7 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.SentenceGenerator import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.ContactRepository import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.ContactType @@ -42,7 +42,7 @@ class LicenceActivatedIntegrationTest { @Autowired lateinit var wireMockServer: WireMockServer - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Autowired diff --git a/projects/create-and-vary-a-licence-and-delius/src/main/resources/application.yml b/projects/create-and-vary-a-licence-and-delius/src/main/resources/application.yml index d5b93247de..7e25887055 100644 --- a/projects/create-and-vary-a-licence-and-delius/src/main/resources/application.yml +++ b/projects/create-and-vary-a-licence-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -61,7 +59,7 @@ spring: base-dn: ${spring.ldap.base} seed.database: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser +wiremock.enabled: true oauth2: client-id: create-and-vary-a-licence-and-delius diff --git a/projects/custody-key-dates-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/custody-key-dates-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index f41e6421e9..52a4019119 100644 --- a/projects/custody-key-dates-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/custody-key-dates-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -1,22 +1,16 @@ package uk.gov.justice.digital.hmpps import org.hamcrest.MatcherAssert.assertThat -import org.hamcrest.Matchers.equalTo -import org.hamcrest.Matchers.hasKey -import org.hamcrest.Matchers.not +import org.hamcrest.Matchers.* import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.Test import org.mockito.ArgumentMatchers.anyMap -import org.mockito.kotlin.check -import org.mockito.kotlin.eq -import org.mockito.kotlin.times -import org.mockito.kotlin.verify -import org.mockito.kotlin.whenever +import org.mockito.kotlin.* import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean import org.springframework.test.annotation.DirtiesContext +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.MessageGenerator import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator import uk.gov.justice.digital.hmpps.data.generator.SentenceGenerator.DEFAULT_CUSTODY @@ -43,7 +37,7 @@ internal class IntegrationTest { @Autowired lateinit var channelManager: HmppsChannelManager - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Autowired @@ -52,7 +46,7 @@ internal class IntegrationTest { @Autowired lateinit var custodyRepository: CustodyRepository - @MockBean + @MockitoBean lateinit var featureFlags: FeatureFlags private val sedDate = "2025-09-10" diff --git a/projects/custody-key-dates-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/KeyDateControllerTest.kt b/projects/custody-key-dates-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/KeyDateControllerTest.kt index cb1649592e..40d870ba1d 100644 --- a/projects/custody-key-dates-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/KeyDateControllerTest.kt +++ b/projects/custody-key-dates-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/KeyDateControllerTest.kt @@ -15,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status @@ -45,7 +45,7 @@ internal class KeyDateControllerTest { @Autowired lateinit var custodyRepository: CustodyRepository - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/projects/custody-key-dates-and-delius/src/main/resources/application.yml b/projects/custody-key-dates-and-delius/src/main/resources/application.yml index 8106d13465..da50b40d38 100644 --- a/projects/custody-key-dates-and-delius/src/main/resources/application.yml +++ b/projects/custody-key-dates-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -55,7 +53,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging: consumer.queue: message-queue diff --git a/projects/domain-events-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PublishingIntegrationTest.kt b/projects/domain-events-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PublishingIntegrationTest.kt index 3797a7b85a..13acf3be73 100644 --- a/projects/domain-events-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PublishingIntegrationTest.kt +++ b/projects/domain-events-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PublishingIntegrationTest.kt @@ -12,7 +12,7 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.DomainEventGenerator import uk.gov.justice.digital.hmpps.integrations.delius.DomainEventRepository import uk.gov.justice.digital.hmpps.message.HmppsDomainEvent @@ -31,7 +31,7 @@ internal class PublishingIntegrationTest { @Autowired lateinit var domainEventRepository: DomainEventRepository - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Autowired diff --git a/projects/domain-events-and-delius/src/main/resources/application.yml b/projects/domain-events-and-delius/src/main/resources/application.yml index c46d11cf15..25fa2b57d1 100644 --- a/projects/domain-events-and-delius/src/main/resources/application.yml +++ b/projects/domain-events-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -49,7 +47,7 @@ poller.fixed-delay: 2000 messaging.producer.topic: domain-events -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser +wiremock.enabled: true domain-events: base-url: http://localhost:${wiremock.port} diff --git a/projects/dps-and-delius/src/main/resources/application.yml b/projects/dps-and-delius/src/main/resources/application.yml index b67a17140e..e9bdc74963 100644 --- a/projects/dps-and-delius/src/main/resources/application.yml +++ b/projects/dps-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -47,7 +45,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/effective-proposal-framework-and-delius/src/main/resources/application.yml b/projects/effective-proposal-framework-and-delius/src/main/resources/application.yml index 57710b0631..bef2a010d0 100644 --- a/projects/effective-proposal-framework-and-delius/src/main/resources/application.yml +++ b/projects/effective-proposal-framework-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -44,7 +42,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/external-api-and-delius/src/main/resources/application.yml b/projects/external-api-and-delius/src/main/resources/application.yml index 94786907c1..574810c1fb 100644 --- a/projects/external-api-and-delius/src/main/resources/application.yml +++ b/projects/external-api-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -49,7 +47,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/hdc-licences-and-delius/src/main/resources/application.yml b/projects/hdc-licences-and-delius/src/main/resources/application.yml index b509423485..7a8d23df59 100644 --- a/projects/hdc-licences-and-delius/src/main/resources/application.yml +++ b/projects/hdc-licences-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -52,7 +50,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/hmpps-auth-and-delius/src/main/resources/application.yml b/projects/hmpps-auth-and-delius/src/main/resources/application.yml index d804ef5347..aec71b4d6b 100644 --- a/projects/hmpps-auth-and-delius/src/main/resources/application.yml +++ b/projects/hmpps-auth-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -53,7 +51,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/ims-and-delius/src/main/resources/application.yml b/projects/ims-and-delius/src/main/resources/application.yml index d00b4a9084..9f8e7082e2 100644 --- a/projects/ims-and-delius/src/main/resources/application.yml +++ b/projects/ims-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -51,7 +49,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/justice-email-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/justice-email-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index 161b2e216c..53fe2e05ee 100644 --- a/projects/justice-email-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/justice-email-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -11,7 +11,7 @@ import org.mockito.kotlin.eq import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.Data import uk.gov.justice.digital.hmpps.entity.Contact import uk.gov.justice.digital.hmpps.entity.ContactRepository @@ -31,7 +31,7 @@ internal class IntegrationTest { @Autowired lateinit var contactRepository: ContactRepository - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/projects/justice-email-and-delius/src/main/resources/application.yml b/projects/justice-email-and-delius/src/main/resources/application.yml index 1d59bfc682..65f9253687 100644 --- a/projects/justice-email-and-delius/src/main/resources/application.yml +++ b/projects/justice-email-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE diff --git a/projects/make-recall-decisions-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/RecommendationIntegrationTest.kt b/projects/make-recall-decisions-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/RecommendationIntegrationTest.kt index 6d358676c4..1144f948c7 100644 --- a/projects/make-recall-decisions-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/RecommendationIntegrationTest.kt +++ b/projects/make-recall-decisions-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/RecommendationIntegrationTest.kt @@ -11,7 +11,7 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator import uk.gov.justice.digital.hmpps.data.generator.UserGenerator import uk.gov.justice.digital.hmpps.integrations.delius.recommendation.contact.entity.Contact @@ -33,7 +33,7 @@ internal class RecommendationIntegrationTest { @Autowired lateinit var wireMockServer: WireMockServer - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/projects/make-recall-decisions-and-delius/src/main/resources/application.yml b/projects/make-recall-decisions-and-delius/src/main/resources/application.yml index 430830dd16..bc5b955aa9 100644 --- a/projects/make-recall-decisions-and-delius/src/main/resources/application.yml +++ b/projects/make-recall-decisions-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -63,7 +61,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: message-queue diff --git a/projects/manage-offences-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/manage-offences-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index 79024f7710..43a4431962 100644 --- a/projects/manage-offences-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/manage-offences-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -8,7 +8,7 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.entity.OffenceRepository import uk.gov.justice.digital.hmpps.message.Notification import uk.gov.justice.digital.hmpps.messaging.HmppsChannelManager @@ -23,7 +23,7 @@ internal class IntegrationTest { @Autowired lateinit var channelManager: HmppsChannelManager - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Autowired diff --git a/projects/manage-offences-and-delius/src/main/resources/application.yml b/projects/manage-offences-and-delius/src/main/resources/application.yml index 73194bdcad..bb96d7f54e 100644 --- a/projects/manage-offences-and-delius/src/main/resources/application.yml +++ b/projects/manage-offences-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -50,7 +48,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: message-queue diff --git a/projects/manage-pom-cases-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocationMessagingIntegrationTest.kt b/projects/manage-pom-cases-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocationMessagingIntegrationTest.kt index 94bbd7484a..0af8f57432 100644 --- a/projects/manage-pom-cases-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocationMessagingIntegrationTest.kt +++ b/projects/manage-pom-cases-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocationMessagingIntegrationTest.kt @@ -17,9 +17,9 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean -import org.springframework.boot.test.mock.mockito.SpyBean import org.springframework.data.repository.findByIdOrNull +import org.springframework.test.context.bean.override.mockito.MockitoBean +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator import uk.gov.justice.digital.hmpps.data.generator.ProviderGenerator import uk.gov.justice.digital.hmpps.entity.PrisonStaff @@ -45,13 +45,13 @@ internal class AllocationMessagingIntegrationTest { @Autowired lateinit var wireMockServer: WireMockServer - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService - @SpyBean + @MockitoSpyBean lateinit var staffRepository: PrisonStaffRepository - @SpyBean + @MockitoSpyBean lateinit var prisonManagerRepository: PrisonManagerRepository @Autowired diff --git a/projects/manage-pom-cases-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/HandoverMessagingIntegrationTest.kt b/projects/manage-pom-cases-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/HandoverMessagingIntegrationTest.kt index 513cea3632..6751611d1f 100644 --- a/projects/manage-pom-cases-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/HandoverMessagingIntegrationTest.kt +++ b/projects/manage-pom-cases-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/HandoverMessagingIntegrationTest.kt @@ -10,7 +10,7 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.MessageGenerator import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator import uk.gov.justice.digital.hmpps.integrations.delius.allocation.entity.event.CustodyRepository @@ -39,7 +39,7 @@ internal class HandoverMessagingIntegrationTest { @Autowired lateinit var wireMockServer: WireMockServer - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Autowired diff --git a/projects/manage-pom-cases-and-delius/src/main/resources/application.yml b/projects/manage-pom-cases-and-delius/src/main/resources/application.yml index ae30966362..4faf99dc02 100644 --- a/projects/manage-pom-cases-and-delius/src/main/resources/application.yml +++ b/projects/manage-pom-cases-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -59,7 +57,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging: consumer.queue: message-queue diff --git a/projects/manage-supervision-and-delius/src/main/resources/application.yml b/projects/manage-supervision-and-delius/src/main/resources/application.yml index 4992fe5e6a..87d1ca16b4 100644 --- a/projects/manage-supervision-and-delius/src/main/resources/application.yml +++ b/projects/manage-supervision-and-delius/src/main/resources/application.yml @@ -1,12 +1,10 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: order_by: @@ -55,7 +53,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/manage-supervision-and-oasys/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/manage-supervision-and-oasys/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index c8bccb62ee..5a2e02cfc5 100644 --- a/projects/manage-supervision-and-oasys/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/manage-supervision-and-oasys/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -6,12 +6,12 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status -import uk.gov.justice.digital.hmpps.test.MockMvcExtensions.withToken import uk.gov.justice.digital.hmpps.telemetry.TelemetryService +import uk.gov.justice.digital.hmpps.test.MockMvcExtensions.withToken @AutoConfigureMockMvc @SpringBootTest(webEnvironment = RANDOM_PORT) @@ -22,7 +22,7 @@ internal class IntegrationTest { @Autowired lateinit var wireMockServer: WireMockServer - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/projects/manage-supervision-and-oasys/src/main/resources/application.yml b/projects/manage-supervision-and-oasys/src/main/resources/application.yml index e0fe29163f..7569f33d96 100644 --- a/projects/manage-supervision-and-oasys/src/main/resources/application.yml +++ b/projects/manage-supervision-and-oasys/src/main/resources/application.yml @@ -1,5 +1,4 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null @@ -34,7 +33,7 @@ info.productId: HMPPS518 # https://developer-portal.hmpps.service.justice.gov.uk spring.config.activate.on-profile: [ "dev", "integration-test" ] server.shutdown: immediate -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser +wiremock.enabled: true integrations: ords: diff --git a/projects/oasys-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/oasys-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index fb4fcc85e2..25fb91da4b 100644 --- a/projects/oasys-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/oasys-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -12,7 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status @@ -32,7 +32,7 @@ internal class IntegrationTest { @Autowired lateinit var mockMvc: MockMvc - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/projects/oasys-and-delius/src/main/resources/application.yml b/projects/oasys-and-delius/src/main/resources/application.yml index 7e8f59a6a4..83387bf082 100644 --- a/projects/oasys-and-delius/src/main/resources/application.yml +++ b/projects/oasys-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -43,7 +41,7 @@ spring: jpa.hibernate.ddl-auto: create-drop seed.database: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser +wiremock.enabled: true logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/offender-events-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/offender-events-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index b516699c74..d0ebda31d9 100644 --- a/projects/offender-events-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/offender-events-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -10,8 +10,8 @@ import org.mockito.kotlin.* import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean -import org.springframework.boot.test.mock.mockito.SpyBean +import org.springframework.test.context.bean.override.mockito.MockitoBean +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean import uk.gov.justice.digital.hmpps.data.generator.OffenderDeltaGenerator import uk.gov.justice.digital.hmpps.integrations.delius.offender.OffenderDelta import uk.gov.justice.digital.hmpps.integrations.delius.offender.OffenderDeltaRepository @@ -30,10 +30,10 @@ internal class IntegrationTest { @Autowired lateinit var offenderDeltaRepository: OffenderDeltaRepository - @SpyBean + @MockitoSpyBean lateinit var offenderDeltaService: OffenderDeltaService - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @ParameterizedTest diff --git a/projects/offender-events-and-delius/src/main/resources/application.yml b/projects/offender-events-and-delius/src/main/resources/application.yml index 02583ab57c..a90f2bb99b 100644 --- a/projects/offender-events-and-delius/src/main/resources/application.yml +++ b/projects/offender-events-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE diff --git a/projects/opd-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/OpdIntegrationTest.kt b/projects/opd-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/OpdIntegrationTest.kt index 0016d6aa65..28799e8942 100644 --- a/projects/opd-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/OpdIntegrationTest.kt +++ b/projects/opd-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/OpdIntegrationTest.kt @@ -13,7 +13,7 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.ContactRepository import uk.gov.justice.digital.hmpps.integrations.delius.contact.entity.ContactType @@ -32,7 +32,7 @@ internal class OpdIntegrationTest { @Autowired lateinit var channelManager: HmppsChannelManager - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Autowired diff --git a/projects/opd-and-delius/src/main/resources/application.yml b/projects/opd-and-delius/src/main/resources/application.yml index 01cac76996..1de9e85c83 100644 --- a/projects/opd-and-delius/src/main/resources/application.yml +++ b/projects/opd-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -40,7 +38,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: message-queue diff --git a/projects/pathfinder-and-delius/src/main/resources/application.yml b/projects/pathfinder-and-delius/src/main/resources/application.yml index 29eb87ec22..4dc6c376af 100644 --- a/projects/pathfinder-and-delius/src/main/resources/application.yml +++ b/projects/pathfinder-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -52,7 +50,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/pre-sentence-reports-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PsrCompletedIntegrationTest.kt b/projects/pre-sentence-reports-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PsrCompletedIntegrationTest.kt index 42e39b21c4..a8f0012443 100644 --- a/projects/pre-sentence-reports-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PsrCompletedIntegrationTest.kt +++ b/projects/pre-sentence-reports-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PsrCompletedIntegrationTest.kt @@ -10,8 +10,8 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean -import org.springframework.boot.test.mock.mockito.SpyBean +import org.springframework.test.context.bean.override.mockito.MockitoBean +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean import uk.gov.justice.digital.hmpps.data.generator.DocumentGenerator import uk.gov.justice.digital.hmpps.integrations.alfresco.AlfrescoUploadClient import uk.gov.justice.digital.hmpps.integrations.delius.document.DocumentRepository @@ -28,7 +28,7 @@ class PsrCompletedIntegrationTest { @Autowired private lateinit var channelManager: HmppsChannelManager - @MockBean + @MockitoBean private lateinit var telemetryService: TelemetryService @Autowired @@ -37,7 +37,7 @@ class PsrCompletedIntegrationTest { @Autowired private lateinit var documentRepository: DocumentRepository - @SpyBean + @MockitoSpyBean private lateinit var alfrescoUploadClient: AlfrescoUploadClient @Test diff --git a/projects/pre-sentence-reports-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PsrContextIntegrationTest.kt b/projects/pre-sentence-reports-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PsrContextIntegrationTest.kt index 998fd1e3fd..0c79161b9a 100644 --- a/projects/pre-sentence-reports-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PsrContextIntegrationTest.kt +++ b/projects/pre-sentence-reports-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PsrContextIntegrationTest.kt @@ -8,7 +8,7 @@ import org.mockito.kotlin.whenever import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status @@ -30,7 +30,7 @@ class PsrContextIntegrationTest { @Autowired lateinit var objectMapper: ObjectMapper - @MockBean + @MockitoBean lateinit var courtReportRepository: CourtReportRepository @Test diff --git a/projects/pre-sentence-reports-to-delius/src/main/resources/application.yml b/projects/pre-sentence-reports-to-delius/src/main/resources/application.yml index fd3cd1627a..96dbac2423 100644 --- a/projects/pre-sentence-reports-to-delius/src/main/resources/application.yml +++ b/projects/pre-sentence-reports-to-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -57,7 +55,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: pre-sentence-report-events diff --git a/projects/prison-case-notes-to-probation/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CaseNotesIntegrationTest.kt b/projects/prison-case-notes-to-probation/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CaseNotesIntegrationTest.kt index 22b124bea4..e684198bab 100644 --- a/projects/prison-case-notes-to-probation/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CaseNotesIntegrationTest.kt +++ b/projects/prison-case-notes-to-probation/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CaseNotesIntegrationTest.kt @@ -15,8 +15,8 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean -import org.springframework.boot.test.mock.mockito.SpyBean +import org.springframework.test.context.bean.override.mockito.MockitoBean +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean import uk.gov.justice.digital.hmpps.audit.repository.AuditedInteractionRepository import uk.gov.justice.digital.hmpps.data.generator.* import uk.gov.justice.digital.hmpps.datetime.DeliusDateTimeFormatter @@ -44,13 +44,13 @@ class CaseNotesIntegrationTest { @Autowired private lateinit var staffRepository: StaffRepository - @MockBean + @MockitoBean private lateinit var telemetryService: TelemetryService @Autowired lateinit var wireMockserver: WireMockServer - @SpyBean + @MockitoSpyBean lateinit var air: AuditedInteractionRepository @Test diff --git a/projects/prison-case-notes-to-probation/src/main/resources/application.yml b/projects/prison-case-notes-to-probation/src/main/resources/application.yml index 38b74da5f5..6fa12bad9e 100644 --- a/projects/prison-case-notes-to-probation/src/main/resources/application.yml +++ b/projects/prison-case-notes-to-probation/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -52,7 +50,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: events diff --git a/projects/prison-custody-status-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PcstdIntegrationTestBase.kt b/projects/prison-custody-status-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PcstdIntegrationTestBase.kt index d18cbd7993..3c9474f0da 100644 --- a/projects/prison-custody-status-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PcstdIntegrationTestBase.kt +++ b/projects/prison-custody-status-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PcstdIntegrationTestBase.kt @@ -11,7 +11,7 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.InstitutionGenerator import uk.gov.justice.digital.hmpps.datetime.EuropeLondon import uk.gov.justice.digital.hmpps.flags.FeatureFlags @@ -83,10 +83,10 @@ open class PcstdIntegrationTestBase { @Autowired internal lateinit var licenceConditionRepository: LicenceConditionRepository - @MockBean + @MockitoBean internal lateinit var telemetryService: TelemetryService - @MockBean + @MockitoBean internal lateinit var featureFlags: FeatureFlags internal fun withBooking(booking: Booking, lastMovement: Movement = booking.lastMovement()) { diff --git a/projects/prison-custody-status-to-delius/src/main/resources/application.yml b/projects/prison-custody-status-to-delius/src/main/resources/application.yml index 35f9a624ac..0bf1d0ace1 100644 --- a/projects/prison-custody-status-to-delius/src/main/resources/application.yml +++ b/projects/prison-custody-status-to-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -54,7 +52,7 @@ seed.database: true messaging.consumer.queue: prison-custody-status-events -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser +wiremock.enabled: true integrations: prison-api: diff --git a/projects/prison-education-and-delius/src/main/resources/application.yml b/projects/prison-education-and-delius/src/main/resources/application.yml index 8ffff5658f..cf925dacca 100644 --- a/projects/prison-education-and-delius/src/main/resources/application.yml +++ b/projects/prison-education-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -49,7 +47,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/prison-identifier-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MergeIntegrationTest.kt b/projects/prison-identifier-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MergeIntegrationTest.kt index eece2daaeb..76e4d31b5f 100644 --- a/projects/prison-identifier-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MergeIntegrationTest.kt +++ b/projects/prison-identifier-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/MergeIntegrationTest.kt @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator.PERSON_WITH_NOMS import uk.gov.justice.digital.hmpps.messaging.HmppsChannelManager import uk.gov.justice.digital.hmpps.telemetry.TelemetryService @@ -25,7 +25,7 @@ internal class MergeIntegrationTest { @Autowired lateinit var channelManager: HmppsChannelManager - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/projects/prison-identifier-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PrisonMatchingIntegrationTest.kt b/projects/prison-identifier-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PrisonMatchingIntegrationTest.kt index 3563f038dc..fb139f96bf 100644 --- a/projects/prison-identifier-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PrisonMatchingIntegrationTest.kt +++ b/projects/prison-identifier-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PrisonMatchingIntegrationTest.kt @@ -12,9 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean -import org.springframework.boot.test.mock.mockito.SpyBean import org.springframework.data.repository.findByIdOrNull +import org.springframework.test.context.bean.override.mockito.MockitoBean +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status @@ -33,19 +33,19 @@ internal class PrisonMatchingIntegrationTest { @Autowired lateinit var mockMvc: MockMvc - @SpyBean + @MockitoSpyBean lateinit var personRepository: PersonRepository - @SpyBean + @MockitoSpyBean lateinit var custodyRepository: CustodyRepository - @SpyBean + @MockitoSpyBean lateinit var additionalIdentifierRepository: AdditionalIdentifierRepository - @SpyBean + @MockitoSpyBean lateinit var contactRepository: ContactRepository - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/projects/prison-identifier-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ProbationMatchingIntegrationTest.kt b/projects/prison-identifier-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ProbationMatchingIntegrationTest.kt index 32b0cb0fb8..f306cdc679 100644 --- a/projects/prison-identifier-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ProbationMatchingIntegrationTest.kt +++ b/projects/prison-identifier-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ProbationMatchingIntegrationTest.kt @@ -12,10 +12,9 @@ import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean -import org.springframework.boot.test.mock.mockito.SpyBean import org.springframework.test.annotation.DirtiesContext -import org.springframework.test.context.TestPropertySource +import org.springframework.test.context.bean.override.mockito.MockitoBean +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean import uk.gov.justice.digital.hmpps.entity.AdditionalIdentifierRepository import uk.gov.justice.digital.hmpps.entity.CustodyRepository import uk.gov.justice.digital.hmpps.entity.PersonRepository @@ -35,16 +34,16 @@ internal class ProbationMatchingIntegrationTest { @Autowired lateinit var wireMockServer: WireMockServer - @SpyBean + @MockitoSpyBean lateinit var personRepository: PersonRepository - @SpyBean + @MockitoSpyBean lateinit var custodyRepository: CustodyRepository - @SpyBean + @MockitoSpyBean lateinit var additionalIdentifierRepository: AdditionalIdentifierRepository - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/projects/prison-identifier-and-delius/src/main/resources/application.yml b/projects/prison-identifier-and-delius/src/main/resources/application.yml index 5406c0cfae..d48bf7db68 100644 --- a/projects/prison-identifier-and-delius/src/main/resources/application.yml +++ b/projects/prison-identifier-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_empty jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -59,7 +57,7 @@ messaging: producer.topic: domain-events seed.database: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser +wiremock.enabled: true integrations: prison-api.url: http://localhost:${wiremock.port}/prison-api diff --git a/projects/prisoner-profile-and-delius/src/main/resources/application.yml b/projects/prisoner-profile-and-delius/src/main/resources/application.yml index 4b6bd8537b..efa444bf2c 100644 --- a/projects/prisoner-profile-and-delius/src/main/resources/application.yml +++ b/projects/prisoner-profile-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -50,7 +48,7 @@ spring: ldap.embedded.base-dn: ${spring.ldap.base} seed.database: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser +wiremock.enabled: true logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/probation-search-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/probation-search-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index 989c3a9355..14aab56b76 100644 --- a/projects/probation-search-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/probation-search-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -10,8 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean -import org.springframework.boot.test.mock.mockito.SpyBean +import org.springframework.test.context.bean.override.mockito.MockitoBean +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status @@ -34,10 +34,10 @@ internal class IntegrationTest { @Autowired lateinit var mockMvc: MockMvc - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService - @SpyBean + @MockitoSpyBean lateinit var air: AuditedInteractionRepository @Test diff --git a/projects/probation-search-and-delius/src/main/resources/application.yml b/projects/probation-search-and-delius/src/main/resources/application.yml index f38dc8f149..b3686a5576 100644 --- a/projects/probation-search-and-delius/src/main/resources/application.yml +++ b/projects/probation-search-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -45,7 +43,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/refer-and-monitor-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ReferAndMonitorIntegrationTest.kt b/projects/refer-and-monitor-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ReferAndMonitorIntegrationTest.kt index 3399dedb6b..8bcdf31708 100644 --- a/projects/refer-and-monitor-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ReferAndMonitorIntegrationTest.kt +++ b/projects/refer-and-monitor-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ReferAndMonitorIntegrationTest.kt @@ -13,7 +13,7 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.ContactGenerator import uk.gov.justice.digital.hmpps.data.generator.NsiGenerator import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator @@ -47,7 +47,7 @@ internal class ReferAndMonitorIntegrationTest { @Autowired lateinit var wireMockServer: WireMockServer - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Autowired diff --git a/projects/refer-and-monitor-and-delius/src/main/resources/application.yml b/projects/refer-and-monitor-and-delius/src/main/resources/application.yml index 366e7d9931..54a4ccfff9 100644 --- a/projects/refer-and-monitor-and-delius/src/main/resources/application.yml +++ b/projects/refer-and-monitor-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -59,7 +57,7 @@ spring: ldap.embedded.base-dn: ${spring.ldap.base} seed.database: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser +wiremock.enabled: true messaging.consumer.queue: message-queue diff --git a/projects/resettlement-passport-and-delius/src/main/resources/application.yml b/projects/resettlement-passport-and-delius/src/main/resources/application.yml index 2012d4e11c..7996f22ae3 100644 --- a/projects/resettlement-passport-and-delius/src/main/resources/application.yml +++ b/projects/resettlement-passport-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -50,7 +48,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/risk-assessment-scores-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/risk-assessment-scores-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index 0273f8214d..ae5326a8be 100644 --- a/projects/risk-assessment-scores-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/risk-assessment-scores-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -8,7 +8,7 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator import uk.gov.justice.digital.hmpps.exception.ConflictException import uk.gov.justice.digital.hmpps.integrations.delius.RiskAssessmentService @@ -36,7 +36,7 @@ internal class IntegrationTest { @Autowired private lateinit var channelManager: HmppsChannelManager - @MockBean + @MockitoBean private lateinit var telemetryService: TelemetryService @Autowired diff --git a/projects/risk-assessment-scores-to-delius/src/main/resources/application.yml b/projects/risk-assessment-scores-to-delius/src/main/resources/application.yml index 8a6d555bc5..220518eb20 100644 --- a/projects/risk-assessment-scores-to-delius/src/main/resources/application.yml +++ b/projects/risk-assessment-scores-to-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -42,7 +40,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: message-queue diff --git a/projects/sentence-plan-and-delius/src/main/resources/application.yml b/projects/sentence-plan-and-delius/src/main/resources/application.yml index 1fd61c2024..4c9b4df97d 100644 --- a/projects/sentence-plan-and-delius/src/main/resources/application.yml +++ b/projects/sentence-plan-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -44,7 +42,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/sentence-plan-and-oasys/src/main/resources/application.yml b/projects/sentence-plan-and-oasys/src/main/resources/application.yml index d4dbbb5b8a..11c744050e 100644 --- a/projects/sentence-plan-and-oasys/src/main/resources/application.yml +++ b/projects/sentence-plan-and-oasys/src/main/resources/application.yml @@ -1,5 +1,4 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_empty @@ -25,7 +24,6 @@ spring.config.activate.on-profile: [ "dev", "integration-test" ] server.shutdown: immediate wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser ords: client-id: sentence-plan-and-oasys diff --git a/projects/soc-and-delius/src/main/resources/application.yml b/projects/soc-and-delius/src/main/resources/application.yml index 9232d7ccff..100fe7091c 100644 --- a/projects/soc-and-delius/src/main/resources/application.yml +++ b/projects/soc-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -44,7 +42,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/subject-access-requests-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/GetPersonByCRNIntegrationTest.kt b/projects/subject-access-requests-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/GetPersonByCRNIntegrationTest.kt index fca93c1815..281fdff434 100644 --- a/projects/subject-access-requests-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/GetPersonByCRNIntegrationTest.kt +++ b/projects/subject-access-requests-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/GetPersonByCRNIntegrationTest.kt @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get import org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath @@ -26,7 +26,7 @@ internal class GetPersonByCRNIntegrationTest { val crn = PERSON1.crn - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/projects/subject-access-requests-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/UserIntegrationTest.kt b/projects/subject-access-requests-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/UserIntegrationTest.kt index b796306e8f..f15044ceb7 100644 --- a/projects/subject-access-requests-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/UserIntegrationTest.kt +++ b/projects/subject-access-requests-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/UserIntegrationTest.kt @@ -5,6 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT +import org.springframework.test.json.JsonCompareMode import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status @@ -28,7 +29,8 @@ internal class UserIntegrationTest { User("SubjectAccessRequestsAndDelius", "Service"), User("username1", "surname1"), User("username2", "surname2") - ), strict = true + ), + JsonCompareMode.STRICT ) } } diff --git a/projects/subject-access-requests-and-delius/src/main/resources/application.yml b/projects/subject-access-requests-and-delius/src/main/resources/application.yml index 6eedbe51fc..28c3a6a5ed 100644 --- a/projects/subject-access-requests-and-delius/src/main/resources/application.yml +++ b/projects/subject-access-requests-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -44,7 +42,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/projects/tier-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/projects/tier-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index 0f97640fd0..221a411506 100644 --- a/projects/tier-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/projects/tier-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -12,7 +12,7 @@ import org.mockito.kotlin.whenever import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.repository.ContactDevRepository import uk.gov.justice.digital.hmpps.data.repository.ManagementTierDevRepository import uk.gov.justice.digital.hmpps.data.repository.ManagementTierWithEndDateDevRepository @@ -53,10 +53,10 @@ internal class IntegrationTest { @Autowired private lateinit var wireMockServer: WireMockServer - @MockBean + @MockitoBean private lateinit var telemetryService: TelemetryService - @MockBean + @MockitoBean private lateinit var featureFlags: FeatureFlags @Test diff --git a/projects/tier-to-delius/src/main/resources/application.yml b/projects/tier-to-delius/src/main/resources/application.yml index 31b566ab12..e95a7a502a 100644 --- a/projects/tier-to-delius/src/main/resources/application.yml +++ b/projects/tier-to-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: # hibernate.ddl-auto: validate # TODO re-enable this after "tier-end-date" feature flag is enabled - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -56,7 +54,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: message-queue integrations.tier.url: http://localhost:${wiremock.port}/hmpps-tier diff --git a/projects/unpaid-work-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AssessmentCompleteIntegrationTest.kt b/projects/unpaid-work-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AssessmentCompleteIntegrationTest.kt index 6bcac57d34..2deca889e3 100644 --- a/projects/unpaid-work-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AssessmentCompleteIntegrationTest.kt +++ b/projects/unpaid-work-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AssessmentCompleteIntegrationTest.kt @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc import uk.gov.justice.digital.hmpps.data.generator.CaseGenerator import uk.gov.justice.digital.hmpps.integrations.common.entity.contact.ContactRepository @@ -42,7 +42,7 @@ internal class AssessmentCompleteIntegrationTest { @Autowired lateinit var documentRepository: DocumentRepository - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/projects/unpaid-work-and-delius/src/main/resources/application.yml b/projects/unpaid-work-and-delius/src/main/resources/application.yml index eb9a95e550..2c8ec41af0 100644 --- a/projects/unpaid-work-and-delius/src/main/resources/application.yml +++ b/projects/unpaid-work-and-delius/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -55,7 +53,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: message-queue diff --git a/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocateEventIntegrationTest.kt b/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocateEventIntegrationTest.kt index 7f368f367e..95d14fb5c0 100644 --- a/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocateEventIntegrationTest.kt +++ b/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocateEventIntegrationTest.kt @@ -11,8 +11,8 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean import org.springframework.data.repository.findByIdOrNull +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.EventGenerator import uk.gov.justice.digital.hmpps.data.generator.OrderManagerGenerator import uk.gov.justice.digital.hmpps.data.generator.StaffGenerator @@ -42,7 +42,7 @@ class AllocateEventIntegrationTest { @Autowired private lateinit var orderManagerRepository: OrderManagerRepository - @MockBean + @MockitoBean private lateinit var telemetryService: TelemetryService @Autowired diff --git a/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocatePersonIntegrationTest.kt b/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocatePersonIntegrationTest.kt index d8ac15c5f5..c1326d80d3 100644 --- a/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocatePersonIntegrationTest.kt +++ b/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocatePersonIntegrationTest.kt @@ -10,8 +10,8 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean import org.springframework.data.repository.findByIdOrNull +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator import uk.gov.justice.digital.hmpps.data.generator.PersonManagerGenerator import uk.gov.justice.digital.hmpps.data.generator.ResponsibleOfficerGenerator @@ -40,7 +40,7 @@ class AllocatePersonIntegrationTest { @Autowired private lateinit var responsibleOfficerRepository: ResponsibleOfficerRepository - @MockBean + @MockitoBean private lateinit var telemetryService: TelemetryService @Test diff --git a/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocateRequirementIntegrationTest.kt b/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocateRequirementIntegrationTest.kt index 4a326aadc6..88c5ef51db 100644 --- a/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocateRequirementIntegrationTest.kt +++ b/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocateRequirementIntegrationTest.kt @@ -10,8 +10,8 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean import org.springframework.data.repository.findByIdOrNull +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.RequirementGenerator import uk.gov.justice.digital.hmpps.data.generator.RequirementManagerGenerator import uk.gov.justice.digital.hmpps.integrations.delius.event.requirement.Requirement @@ -38,7 +38,7 @@ class AllocateRequirementIntegrationTest { @Autowired private lateinit var requirementManagerRepository: RequirementManagerRepository - @MockBean + @MockitoBean private lateinit var telemetryService: TelemetryService @Test diff --git a/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocationDemandIntegrationTest.kt b/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocationDemandIntegrationTest.kt index a85c7bed98..a6fe7680c4 100644 --- a/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocationDemandIntegrationTest.kt +++ b/projects/workforce-allocations-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/AllocationDemandIntegrationTest.kt @@ -8,7 +8,7 @@ import org.mockito.kotlin.whenever import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post @@ -29,7 +29,7 @@ class AllocationDemandIntegrationTest { @Autowired lateinit var mockMvc: MockMvc - @MockBean + @MockitoBean lateinit var allocationDemandRepository: AllocationDemandRepository @Test diff --git a/projects/workforce-allocations-to-delius/src/main/resources/application.yml b/projects/workforce-allocations-to-delius/src/main/resources/application.yml index e8e7e0ff9f..73d4922f69 100644 --- a/projects/workforce-allocations-to-delius/src/main/resources/application.yml +++ b/projects/workforce-allocations-to-delius/src/main/resources/application.yml @@ -1,12 +1,10 @@ # Default config -server.shutdown: graceful spring: mvc.async.request-timeout: 5m # for report download jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -62,7 +60,7 @@ spring: validation.enabled: false seed.database: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser +wiremock.enabled: true messaging.consumer.queue: workforce-allocations-events diff --git a/templates/projects/api-client-and-server/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/templates/projects/api-client-and-server/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index c8bccb62ee..8dc965d618 100644 --- a/templates/projects/api-client-and-server/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/templates/projects/api-client-and-server/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status @@ -22,7 +22,7 @@ internal class IntegrationTest { @Autowired lateinit var wireMockServer: WireMockServer - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/templates/projects/api-client-and-server/src/main/resources/application.yml b/templates/projects/api-client-and-server/src/main/resources/application.yml index 84ec4fd640..af12c532ca 100644 --- a/templates/projects/api-client-and-server/src/main/resources/application.yml +++ b/templates/projects/api-client-and-server/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -55,7 +53,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser oauth2: client-id: $SERVICE_NAME diff --git a/templates/projects/api-server/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/templates/projects/api-server/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index d9006c74c5..2adefa8eea 100644 --- a/templates/projects/api-server/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/templates/projects/api-server/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status @@ -18,7 +18,7 @@ internal class IntegrationTest { @Autowired lateinit var mockMvc: MockMvc - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/templates/projects/api-server/src/main/resources/application.yml b/templates/projects/api-server/src/main/resources/application.yml index 9bcff00bfc..f680c1123f 100644 --- a/templates/projects/api-server/src/main/resources/application.yml +++ b/templates/projects/api-server/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -44,7 +42,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser logging.level: uk.gov.justice.digital.hmpps: DEBUG diff --git a/templates/projects/message-listener-with-api-client-and-server/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/templates/projects/message-listener-with-api-client-and-server/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index 60d06af963..99e7815b61 100644 --- a/templates/projects/message-listener-with-api-client-and-server/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/templates/projects/message-listener-with-api-client-and-server/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import org.springframework.test.web.servlet.MockMvc import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status @@ -32,7 +32,7 @@ internal class IntegrationTest { @Autowired lateinit var mockMvc: MockMvc - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/templates/projects/message-listener-with-api-client-and-server/src/main/resources/application.yml b/templates/projects/message-listener-with-api-client-and-server/src/main/resources/application.yml index 792a47e611..9fe9f886cc 100644 --- a/templates/projects/message-listener-with-api-client-and-server/src/main/resources/application.yml +++ b/templates/projects/message-listener-with-api-client-and-server/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -55,7 +53,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: message-queue diff --git a/templates/projects/message-listener-with-api-client/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/templates/projects/message-listener-with-api-client/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index 2c6461b551..9a80a46748 100644 --- a/templates/projects/message-listener-with-api-client/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/templates/projects/message-listener-with-api-client/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -6,7 +6,7 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.MessageGenerator import uk.gov.justice.digital.hmpps.message.Notification import uk.gov.justice.digital.hmpps.messaging.HmppsChannelManager @@ -22,7 +22,7 @@ internal class IntegrationTest { @Autowired lateinit var channelManager: HmppsChannelManager - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/templates/projects/message-listener-with-api-client/src/main/resources/application.yml b/templates/projects/message-listener-with-api-client/src/main/resources/application.yml index 1021120ff6..53b104452f 100644 --- a/templates/projects/message-listener-with-api-client/src/main/resources/application.yml +++ b/templates/projects/message-listener-with-api-client/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE @@ -50,7 +48,6 @@ spring: seed.database: true wiremock.enabled: true -context.initializer.classes: uk.gov.justice.digital.hmpps.wiremock.WireMockInitialiser messaging.consumer.queue: message-queue diff --git a/templates/projects/message-listener/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/templates/projects/message-listener/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt index 2c6461b551..9a80a46748 100644 --- a/templates/projects/message-listener/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt +++ b/templates/projects/message-listener/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt @@ -6,7 +6,7 @@ import org.mockito.kotlin.verify import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Value import org.springframework.boot.test.context.SpringBootTest -import org.springframework.boot.test.mock.mockito.MockBean +import org.springframework.test.context.bean.override.mockito.MockitoBean import uk.gov.justice.digital.hmpps.data.generator.MessageGenerator import uk.gov.justice.digital.hmpps.message.Notification import uk.gov.justice.digital.hmpps.messaging.HmppsChannelManager @@ -22,7 +22,7 @@ internal class IntegrationTest { @Autowired lateinit var channelManager: HmppsChannelManager - @MockBean + @MockitoBean lateinit var telemetryService: TelemetryService @Test diff --git a/templates/projects/message-listener/src/main/resources/application.yml b/templates/projects/message-listener/src/main/resources/application.yml index d12d2aa42b..7d9099e272 100644 --- a/templates/projects/message-listener/src/main/resources/application.yml +++ b/templates/projects/message-listener/src/main/resources/application.yml @@ -1,11 +1,9 @@ # Default config -server.shutdown: graceful spring: jackson: default-property-inclusion: non_null jpa: hibernate.ddl-auto: validate - database-platform: org.hibernate.dialect.OracleDialect properties: hibernate: timezone.default_storage: NORMALIZE diff --git a/templates/runConfiguration.xml b/templates/runConfiguration.xml index 75a9d1e251..77ece0b9e3 100644 --- a/templates/runConfiguration.xml +++ b/templates/runConfiguration.xml @@ -1,29 +1,10 @@ - - - - - - - true - true - false - false - + + \ No newline at end of file