Merge branch 'main' into dependabot/gradle/e2e-tests/org.junit.jupiter-junit-jupiter-api-5.11.4

Author: ORybak5

docker/docker-compose.yml

@@ -35,8 +35,6 @@ services:
       - GP2GP_SSL_TRUST_STORE_URL
       - GP2GP_SSL_TRUST_STORE_PASSWORD
       - GP2GP_GPC_OVERRIDE_NHS_NUMBER
-      - GP2GP_GPC_OVERRIDE_FROM_ASID
-      - GP2GP_GPC_OVERRIDE_TO_ASID
       - GP2GP_GPC_GET_TEST_URL
       - GP2GP_LARGE_ATTACHMENT_THRESHOLD
       - GP2GP_LARGE_EHR_EXTRACT_THRESHOLD

e2e-tests/build.gradle

@@ -16,12 +16,12 @@ dependencies {
     implementation 'org.apache.qpid:qpid-jms-client:0.57.0'
     implementation "org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1"
     implementation 'org.mongodb:mongo-java-driver:3.12.14'
-    testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
+    testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
     testImplementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2'
     testImplementation 'commons-io:commons-io:2.17.0'
     testImplementation 'org.awaitility:awaitility:4.2.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.4'
-    testImplementation "org.assertj:assertj-core:3.26.3"
+    testImplementation "org.assertj:assertj-core:3.27.2"
     testImplementation 'ch.qos.logback:logback-classic:1.5.15'
     testImplementation 'org.xmlunit:xmlunit-assertj3:2.10.0'
     testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.3.1'

service/build.gradle

@@ -65,7 +65,7 @@ dependencies {
 
 	// Test
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-	testImplementation "org.assertj:assertj-core:3.26.3"
+	testImplementation "org.assertj:assertj-core:3.27.2"
 	testImplementation 'org.testcontainers:testcontainers:1.20.4'
 	testImplementation 'org.awaitility:awaitility:4.2.2'
 	testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.3'

service/src/intTest/resources/application.yml

@@ -52,8 +52,6 @@ gp2gp:
     patientEndpoint: ${GP2GP_GPC_DOCUMENTS_FHIR_BASE:/documents/fhir}/Patient
     patientDocumentReferenceEndpoint: ${GP2GP_GPC_DOCUMENTS_FHIR_BASE:/documents/fhir}/Patient
     overrideNhsNumber: ${GP2GP_GPC_OVERRIDE_NHS_NUMBER:}
-    overrideFromAsid: ${GP2GP_GPC_OVERRIDE_FROM_ASID:}
-    overrideToAsid: ${GP2GP_GPC_OVERRIDE_TO_ASID:}
     maxRequestSize: ${GP2GP_GPC_MAX_REQUEST_SIZE:150000000} # default 150MB
     requestingPractitionerSDSUserId: ${GP2GP_REQUESTING_PRACTITIONER_SDS_USER_ID:UNK}
     requestingPractitionerSDSRoleProfileId: ${GP2GP_REQUESTING_PRACTITIONER_SDS_ROLE_PROFILE_ID:UNK}

service/src/main/java/uk/nhs/adaptors/gp2gp/gpc/builder/GpcRequestBuilder.java

@@ -43,11 +43,6 @@
 @Slf4j
 public class GpcRequestBuilder {
 
-    @Value("${gp2gp.gpc.overrideFromAsid}")
-    private String overrideFromAsid;
-    @Value("${gp2gp.gpc.overrideToAsid}")
-    private String overrideToAsid;
-
     private static final String NHS_NUMBER_SYSTEM = "https://fhir.nhs.uk/Id/nhs-number";
     private static final String FHIR_CONTENT_TYPE = "application/fhir+json";
     private static final String SSP_INTERACTION_ID = "Ssp-InteractionID";

service/src/main/resources/application.yml

@@ -45,8 +45,6 @@ gp2gp:
     url: ${GP2GP_GPC_GET_URL:http://localhost:8090/@ODS_CODE@/STU3/1/gpconnect}
     migrateStructuredEndpoint: ${GP2GP_GPC_STRUCTURED_FHIR_BASE:/fhir}/Patient/$gpc.migratestructuredrecord
     overrideNhsNumber: ${GP2GP_GPC_OVERRIDE_NHS_NUMBER:}
-    overrideFromAsid: ${GP2GP_GPC_OVERRIDE_FROM_ASID:}
-    overrideToAsid: ${GP2GP_GPC_OVERRIDE_TO_ASID:}
     maxRequestSize: ${GP2GP_GPC_MAX_REQUEST_SIZE:150000000} # default 150MB
     requestingPractitionerSDSUserId: ${GP2GP_REQUESTING_PRACTITIONER_SDS_USER_ID:UNK}
     requestingPractitionerSDSRoleProfileId: ${GP2GP_REQUESTING_PRACTITIONER_SDS_ROLE_PROFILE_ID:UNK}

wiremock/build.gradle

@@ -6,7 +6,7 @@ repositories {
 
 dependencies {
   implementation "org.wiremock:wiremock:3.10.0"
-  implementation "org.json:json:20240303"
+  implementation "org.json:json:20241224"
   implementation "com.auth0:java-jwt:4.4.0"
   implementation "org.slf4j:slf4j-simple:2.0.16"
 }