Dmp 3357 performance improvements

Jenkinsfile_CNP

@@ -13,9 +13,30 @@ def secrets = [
                 secret('app-insights-connection-string', 'app-insights-connection-string'),
                 secret('AzureAdB2CClientId', 'AAD_B2C_CLIENT_ID'),
                 secret('ExternalServiceBasicAuthorisationWhitelist', 'EXTERNAL_SERVICE_BASIC_AUTHORISATION_WHITELIST'),
-        ],
+                secret('ViQExternalUserName', 'VIQ_EXTERNAL_USER_NAME'),
+                secret('ViQExternalPassword', 'VIQ_EXTERNAL_PASSWORD'),
+                secret('ViQInternalPassword', 'VIQ_INTERNAL_PASSWORD'),
+
+                secret('XhibitExternalUserName', 'XHIBIT_EXTERNAL_USER_NAME'),
+                secret('XhibitExternalPassword', 'XHIBIT_EXTERNAL_PASSWORD'),
+                secret('XhibitInternalPassword', 'XHIBIT_INTERNAL_PASSWORD'),
+
+                secret('CPExternalUserName', 'CP_EXTERNAL_USER_NAME'),
+                secret('CPExternalPassword', 'CP_EXTERNAL_PASSWORD'),
+                secret('CPInternalPassword', 'CP_INTERNAL_PASSWORD'),
+
+                secret('AzureAdB2CFuncTestROPCClientId', 'AAD_B2C_ROPC_CLIENT_ID'),
+                secret('AzureAdB2CFuncTestROPCUsername', 'FUNC_TEST_ROPC_USERNAME'),
+                secret('AzureAdB2CFuncTestROPCPassword', 'FUNC_TEST_ROPC_PASSWORD'),
+                secret('AzureAdB2CFuncTestROPCClientId', 'AAD_B2C_ROPC_CLIENT_ID'),
+                secret('AzureAdB2CFuncTestROPCClientSecret', 'AAD_B2C_ROPC_CLIENT_SECRET')
+        ]
 ]
 
+
+
+
+
 static LinkedHashMap<String, Object> secret(String secretName, String envVar) {
     [$class     : 'AzureKeyVaultSecret',
      secretType : 'Secret',
@@ -31,4 +52,3 @@ withPipeline(type, product, component) {
 
     syncBranchesWithMaster(branchesToSync)
 }
-

Jenkinsfile_nightly

@@ -13,9 +13,26 @@ def component = "gateway"
 
 def secrets = [
         'darts-${env}': [
-                secret('app-insights-connection-string', 'app-insights-connection-string'),
-                secret('AzureAdB2CClientId', 'AAD_B2C_CLIENT_ID'),
-                secret('ExternalServiceBasicAuthorisationWhitelist', 'EXTERNAL_SERVICE_BASIC_AUTHORISATION_WHITELIST'),
+          secret('app-insights-connection-string', 'app-insights-connection-string'),
+          secret('AzureAdB2CClientId', 'AAD_B2C_CLIENT_ID'),
+          secret('ExternalServiceBasicAuthorisationWhitelist', 'EXTERNAL_SERVICE_BASIC_AUTHORISATION_WHITELIST'),
+          secret('ViQExternalUserName', 'VIQ_EXTERNAL_USER_NAME'),
+          secret('ViQExternalPassword', 'VIQ_EXTERNAL_PASSWORD'),
+          secret('ViQInternalPassword', 'VIQ_INTERNAL_PASSWORD'),
+
+          secret('XhibitExternalUserName', 'XHIBIT_EXTERNAL_USER_NAME'),
+          secret('XhibitExternalPassword', 'XHIBIT_EXTERNAL_PASSWORD'),
+          secret('XhibitInternalPassword', 'XHIBIT_INTERNAL_PASSWORD'),
+
+          secret('CPExternalUserName', 'CP_EXTERNAL_USER_NAME'),
+          secret('CPExternalPassword', 'CP_EXTERNAL_PASSWORD'),
+          secret('CPInternalPassword', 'CP_INTERNAL_PASSWORD'),
+
+          secret('AzureAdB2CFuncTestROPCClientId', 'AAD_B2C_ROPC_CLIENT_ID'),
+          secret('AzureAdB2CFuncTestROPCUsername', 'FUNC_TEST_ROPC_USERNAME'),
+          secret('AzureAdB2CFuncTestROPCPassword', 'FUNC_TEST_ROPC_PASSWORD'),
+          secret('AzureAdB2CFuncTestROPCClientId', 'AAD_B2C_ROPC_CLIENT_ID'),
+          secret('AzureAdB2CFuncTestROPCClientSecret', 'AAD_B2C_ROPC_CLIENT_SECRET'),
         ],
 ]
 

Jenkinsfile_parameterized

@@ -8,10 +8,26 @@ def component = "gateway"
 
 def secrets = [
         'darts-${env}': [
-                secret('app-insights-connection-string', 'app-insights-connection-string'),
-                secret('AzureAdB2CClientId', 'AAD_B2C_CLIENT_ID'),
-                secret('ExternalServiceBasicAuthorisationWhitelist', 'EXTERNAL_SERVICE_BASIC_AUTHORISATION_WHITELIST'),
-        ],
+          secret('app-insights-connection-string', 'app-insights-connection-string'),
+          secret('AzureAdB2CClientId', 'AAD_B2C_CLIENT_ID'),
+          secret('ExternalServiceBasicAuthorisationWhitelist', 'EXTERNAL_SERVICE_BASIC_AUTHORISATION_WHITELIST'),
+          secret('ViQExternalUserName', 'VIQ_EXTERNAL_USER_NAME'),
+          secret('ViQExternalPassword', 'VIQ_EXTERNAL_PASSWORD'),
+          secret('ViQInternalPassword', 'VIQ_INTERNAL_PASSWORD'),
+
+          secret('XhibitExternalUserName', 'XHIBIT_EXTERNAL_USER_NAME'),
+          secret('XhibitExternalPassword', 'XHIBIT_EXTERNAL_PASSWORD'),
+          secret('XhibitInternalPassword', 'XHIBIT_INTERNAL_PASSWORD'),
+
+          secret('CPExternalUserName', 'CP_EXTERNAL_USER_NAME'),
+          secret('CPExternalPassword', 'CP_EXTERNAL_PASSWORD'),
+          secret('CPInternalPassword', 'CP_INTERNAL_PASSWORD'),
+
+          secret('AzureAdB2CFuncTestROPCClientId', 'AAD_B2C_ROPC_CLIENT_ID'),
+          secret('AzureAdB2CFuncTestROPCUsername', 'FUNC_TEST_ROPC_USERNAME'),
+          secret('AzureAdB2CFuncTestROPCPassword', 'FUNC_TEST_ROPC_PASSWORD'),
+          secret('AzureAdB2CFuncTestROPCClientId', 'AAD_B2C_ROPC_CLIENT_ID'),
+          secret('AzureAdB2CFuncTestROPCClientSecret', 'AAD_B2C_ROPC_CLIENT_SECRET')        ],
 ]
 
 static LinkedHashMap<String, Object> secret(String secretName, String envVar) {

build.gradle

@@ -30,6 +30,19 @@ configurations.all {
   exclude group: 'org.bouncycastle', module: 'bcpkix-jdk15on'
   exclude group: 'org.bouncycastle', module: 'bcprov-jdk15on' // bcprov-jdk15on-1.69.jar CVE-2023-33201
   exclude group: 'org.bouncycastle', module: 'bcutil-jdk15on'
+
+  resolutionStrategy.capabilitiesResolution.withCapability('org.codehaus.groovy:groovy-json') {
+    selectHighestVersion()
+  }
+  resolutionStrategy.capabilitiesResolution.withCapability('org.codehaus.groovy:groovy-xml') {
+    selectHighestVersion()
+  }
+  resolutionStrategy.capabilitiesResolution.withCapability('org.codehaus.groovy:groovy-jso') {
+    selectHighestVersion()
+  }
+  resolutionStrategy.capabilitiesResolution.withCapability('org.codehaus.groovy:groovy') {
+    selectHighestVersion()
+  }
 }
 
 configurations {
@@ -38,10 +51,25 @@ configurations {
 }
 
 sourceSets {
+  main {
+    java.srcDir "$buildDir/generated/openapi/src/main/java"
+  }
+
+  testCommon {
+    java {
+      compileClasspath += main.output
+      runtimeClasspath += main.output
+      srcDir file('src/testCommon/java')
+    }
+    resources.srcDir file('src/testCommon/resources')
+  }
+
   functionalTest {
     java {
       compileClasspath += main.output
+      compileClasspath += testCommon.output
       runtimeClasspath += main.output
+      runtimeClasspath += testCommon.output
       srcDir file('src/functionalTest/java')
     }
     resources.srcDir file('src/functionalTest/resources')
@@ -50,7 +78,9 @@ sourceSets {
   integrationTest {
     java {
       compileClasspath += main.output
+      compileClasspath += testCommon.output
       runtimeClasspath += main.output
+      runtimeClasspath += testCommon.output
       srcDir file('src/integrationTest/java')
     }
     resources.srcDir file('src/integrationTest/resources')
@@ -64,6 +94,17 @@ sourceSets {
     }
     resources.srcDir file('src/smokeTest/resources')
   }
+
+  test {
+    java {
+      compileClasspath += main.output
+      compileClasspath += testCommon.output
+      runtimeClasspath += main.output
+      runtimeClasspath += testCommon.output
+      srcDir file('src/test/java')
+    }
+    resources.srcDir file('src/test/resources')
+  }
 }
 
 idea {
@@ -74,14 +115,18 @@ idea {
     testResources.from(sourceSets.functionalTest.resources.srcDirs)
     testSources.from(sourceSets.smokeTest.allSource.srcDirs)
     testResources.from(sourceSets.smokeTest.resources.srcDirs)
+    testSources.from(sourceSets.testCommon.allSource.srcDirs)
+    testResources.from(sourceSets.testCommon.resources.srcDirs)
   }
 }
 
 configurations {
-  functionalTestImplementation.extendsFrom testImplementation
+  testCommonImplementation.extendsFrom testImplementation
+
+  functionalTestImplementation.extendsFrom testCommonImplementation
   functionalTestRuntimeOnly.extendsFrom runtimeOnly
 
-  integrationTestImplementation.extendsFrom testImplementation
+  integrationTestImplementation.extendsFrom testCommonImplementation
   integrationTestRuntimeOnly.extendsFrom runtimeOnly
 
   smokeTestImplementation.extendsFrom testImplementation
@@ -181,8 +226,9 @@ def sonarExclusions = [
   '**/enums/**',
   '**/DocumentumIdToJwtCache*',
   '**/CacheValueWithJwt*',
-  '**/com/service/viq/event/**'
-
+  '**/com/service/viq/event/**',
+  '**/uk/gov/hmcts/darts/cache/token/service/**',
+  '**/uk/gov/hmcts/darts/test/**'
 ]
 
 sonarqube {
@@ -301,6 +347,7 @@ sourceSets {
 }
 
 dependencies {
+  implementation group: 'io.rest-assured', name: 'rest-assured'
   implementation 'org.apache.tomcat.embed:tomcat-embed-core:10.1.25'
   implementation 'org.apache.tomcat.embed:tomcat-embed-websocket:10.1.25'
   implementation 'org.apache.tomcat.embed:tomcat-embed-el:10.1.25'
@@ -356,17 +403,13 @@ dependencies {
     }
   }
 
-  implementation group: 'io.rest-assured', name: 'rest-assured'
   implementation 'org.zalando:problem-spring-web-starter:0.29.1'
   implementation 'org.apache.commons:commons-collections4:4.4'
 
   implementation 'org.mapstruct:mapstruct:1.5.5.Final'
   implementation 'org.openapitools:jackson-databind-nullable:0.2.6'
   implementation group: 'org.apache.xmlbeans', name: 'xmlbeans', version: '5.2.1'
 
-
-  implementation project(path: ':context')
-
   // https://mvnrepository.com/artifact/org.apache.ws.xmlschema/xmlschema-core
   implementation group: 'org.apache.ws.xmlschema', name: 'xmlschema-core', version: '2.3.1'
   // https://mvnrepository.com/artifact/javax.mail/javax.mail-api
@@ -376,8 +419,10 @@ dependencies {
   // https://mvnrepository.com/artifact/com.sun.mail/javax.mail
   implementation group: 'com.sun.mail', name: 'javax.mail', version: '1.6.2'
 
-
   implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.9'
+  implementation project(path: ':context')
+  implementation 'javax.annotation:javax.annotation-api:1.3.2'
+
   annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
 
   testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
@@ -389,20 +434,27 @@ dependencies {
   testImplementation group: 'org.mockito', name: 'mockito-inline', version: '5.2.0'
   testImplementation group: 'org.springframework.ws', name: 'spring-ws-test', version: '4.0.11'
   testImplementation group: 'commons-io', name: 'commons-io', version: '2.16.1'// CVE-2021-29425
-  testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-contract-stub-runner', version: '4.1.3'
   testImplementation group: 'commons-collections', name: 'commons-collections', version: '3.2.2'
   testImplementation 'org.xmlunit:xmlunit-core:2.10.0'
   testImplementation 'org.xmlunit:xmlunit-matchers:2.10.0'
   testImplementation 'org.testcontainers:testcontainers:1.19.8'
   testImplementation 'org.springframework.boot:spring-boot-testcontainers'
-
+  testImplementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-contract-stub-runner', version: '4.1.3'
 
   testImplementation group: 'org.testcontainers', name: 'junit-jupiter', version: '1.19.8'
   testImplementation 'it.ozimov:embedded-redis:0.7.3'
   testImplementation 'io.github.hakky54:logcaptor:2.9.3'
+  testImplementation group: 'org.apache.jmeter', name: 'ApacheJMeter_core', version: '5.6.3', {
+    exclude group: 'org.codehaus.groovy', module: 'groovy-json'
+    exclude group: 'org.codehaus.groovy', module: 'groovy-xml'
+    exclude group: 'org.codehaus.groovy', module: 'groovy-jso'
+    exclude group: 'org.codehaus.groovy', module: 'groovy'
+  }
 
-  openapispec 'com.github.hmcts:darts-api:master-SNAPSHOT:openapi'
+  testImplementation group: 'org.apache.jmeter', name: 'ApacheJMeter_http', version: '5.6.3'
 
+
+  openapispec 'com.github.hmcts:darts-api:master-SNAPSHOT:openapi'
 }
 
 mainClassName = 'uk.gov.hmcts.darts.Application'
@@ -468,6 +520,10 @@ sourceSets {
   }
 }
 
+tasks.named('processTestResources', Copy) {
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
 task genJaxb {
   ext.sourcesDir = "${buildDir}/generated-sources/jaxb"
   ext.schema = "src/main/resources/schemas/dar-notify-event.xsd"

charts/darts-gateway/values.dev.template.yaml

@@ -39,3 +39,4 @@ java:
           alias: EXTERNAL_SERVICE_BASIC_AUTHORISATION_WHITELIST
   environment:
     DARTS_API_URL: https://darts-api.staging.platform.hmcts.net
+    TESTING_SUPPORT_ENDPOINTS_ENABLED: true

charts/darts-gateway/values.stg.template.yaml

@@ -4,3 +4,4 @@ java:
   ingressHost: ${SERVICE_FQDN}
   environment:
     DARTS_API_URL: https://darts-api.staging.platform.hmcts.net
+    TESTING_SUPPORT_ENDPOINTS_ENABLED: true

docker-compose-local.yml

@@ -70,6 +70,13 @@ services:
       - CP_EXTERNAL_PASSWORD
       - CP_INTERNAL_PASSWORD
       - EXTERNAL_SERVICE_BASIC_AUTHORISATION_WHITELIST
+      - REDIS_SSL_ENABLED=false
+      - TESTING_SUPPORT_ENDPOINTS_ENABLED=true
+      - REDIS_CONNECTION_STRING=redis://darts-redis:6379
+      - ACTIVE_DIRECTORY_B2C_BASE_URI=https://hmctsstgextid.b2clogin.com
+      - ACTIVE_DIRECTORY_B2C_AUTH_URI=https://hmctsstgextid.b2clogin.com/hmctsstgextid.onmicrosoft.com
+      - ACTIVE_DIRECTORY_B2C_ON_MICROSOFT_URI=https://hmctsstgextid.onmicrosoft.com
+      - AAD_B2C_TENANT_ID
     ports:
       - "8070:8070"
     networks:

docker-compose.yml

@@ -20,10 +20,14 @@ services:
       - CP_EXTERNAL_PASSWORD
       - CP_INTERNAL_PASSWORD
       - EXTERNAL_SERVICE_BASIC_AUTHORISATION_WHITELIST
-    build:
+      - ACTIVE_DIRECTORY_B2C_BASE_URI
+      - ACTIVE_DIRECTORY_B2C_AUTH_URI
+      - ACTIVE_DIRECTORY_B2C_ON_MICROSOFT_URI
+      - AAD_B2C_TENANT_ID
+  build:
       context: .
       dockerfile: Dockerfile
-    image: darts-gateway:latest
+    image: darts-gateway:master
     ports:
       - "8070:8070"
     networks: