DMP-5252-ARM-5-2-Upgrade

Added no sonar to fix sonar complaint of duplicate code

Author: karen-hedges

build.gradle

@@ -5,29 +5,29 @@ buildscript {
 }
 
 plugins {
-    id 'application'
-    id 'checkstyle'
-    id 'pmd'
-    id 'jacoco'
-    id 'idea'
-    id 'io.spring.dependency-management' version '1.1.7'
-    id 'org.springframework.boot' version '3.4.5'
-    id 'org.owasp.dependencycheck' version '12.1.3'
-    id 'com.github.ben-manes.versions' version '0.52.0'
-    id 'org.sonarqube' version '6.2.0.5505'
-    id "io.freefair.lombok" version "8.14"
-    id "org.openapi.generator" version "7.13.0"
-    id "org.flywaydb.flyway" version "11.11.0"
-    id 'maven-publish'
-    id("com.dorongold.task-tree") version "4.0.1"
+  id 'application'
+  id 'checkstyle'
+  id 'pmd'
+  id 'jacoco'
+  id 'idea'
+  id 'io.spring.dependency-management' version '1.1.7'
+  id 'org.springframework.boot' version '3.4.5'
+  id 'org.owasp.dependencycheck' version '12.1.3'
+  id 'com.github.ben-manes.versions' version '0.52.0'
+  id 'org.sonarqube' version '6.2.0.5505'
+  id "io.freefair.lombok" version "8.14"
+  id "org.openapi.generator" version "7.13.0"
+  id "org.flywaydb.flyway" version "11.11.0"
+  id 'maven-publish'
+  id("com.dorongold.task-tree") version "4.0.1"
 }
 
 jacoco {
   toolVersion = "0.8.13"
   reportsDirectory.set(layout.buildDirectory.dir("jacocoHtml"))
 }
 
-def buildNumber = System.getenv("RELEASE_VERSION")?: "DEV-SNAPSHOT"
+def buildNumber = System.getenv("RELEASE_VERSION") ?: "DEV-SNAPSHOT"
 
 group 'com.github.hmcts'
 version buildNumber
@@ -235,10 +235,10 @@ checkstyle {
 }
 
 pmd {
-    toolVersion = "7.16.0"
-    reportsDir = file("$project.buildDir/reports/pmd")
-    // https://github.com/pmd/pmd/issues/876
-    ruleSets = []
+  toolVersion = "7.16.0"
+  reportsDir = file("$project.buildDir/reports/pmd")
+  // https://github.com/pmd/pmd/issues/876
+  ruleSets = []
 }
 
 
@@ -352,6 +352,8 @@ sonarqube {
     property "sonar.cpd.exclusions", "**/TranscriptionMapper.java"
     property "sonar.cpd.exclusions", "**/ManualTaskService.java"
     property "sonar.scm.exclusions", "**/ManualTaskService.java"
+    property "sonar.cpd.exclusions", "**/ArmRpoClient.java"
+    property "sonar.scm.exclusions", "**/ArmRpoClient.java"
     if (skipSonar) {
       property 'sonar.exclusions', "**/**"
     }
@@ -440,26 +442,26 @@ dependencies {
   implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: '4.2.1'
   implementation 'org.springframework.retry:spring-retry:2.0.12'
 
-    implementation 'net.javacrumbs.shedlock:shedlock-spring:6.9.2'
-    implementation 'net.javacrumbs.shedlock:shedlock-provider-jdbc-template:6.9.2'
+  implementation 'net.javacrumbs.shedlock:shedlock-spring:6.9.2'
+  implementation 'net.javacrumbs.shedlock:shedlock-provider-jdbc-template:6.9.2'
 
-    implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: '6.1.9'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4JVersion
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: log4JVersion
-    implementation group: 'org.apache.commons', name: 'commons-exec', version: '1.5.0'
-    implementation group: 'org.apache.commons', name: 'commons-text', version: '1.14.0'
+  implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: '6.1.9'
+  implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4JVersion
+  implementation group: 'org.apache.logging.log4j', name: 'log4j-to-slf4j', version: log4JVersion
+  implementation group: 'org.apache.commons', name: 'commons-exec', version: '1.5.0'
+  implementation group: 'org.apache.commons', name: 'commons-text', version: '1.14.0'
 
   //CVE-2023-44487
   implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-core', version: tomcatEmbedVersion
   implementation group: 'org.apache.tomcat.embed', name: 'tomcat-embed-websocket', version: tomcatEmbedVersion
 
-    implementation platform('com.azure:azure-sdk-bom:1.2.37')
-    implementation 'com.azure:azure-storage-blob'
+  implementation platform('com.azure:azure-sdk-bom:1.2.37')
+  implementation 'com.azure:azure-storage-blob'
 
-    implementation group: 'io.rest-assured', name: 'rest-assured'
-    implementation group: 'org.flywaydb', name: 'flyway-core', version: '11.11.0'
-    implementation group: 'org.flywaydb', name: 'flyway-database-postgresql', version: '11.11.0'
-    implementation group: 'io.hypersistence', name: 'hypersistence-utils-hibernate-63', version: '3.10.3'
+  implementation group: 'io.rest-assured', name: 'rest-assured'
+  implementation group: 'org.flywaydb', name: 'flyway-core', version: '11.11.0'
+  implementation group: 'org.flywaydb', name: 'flyway-database-postgresql', version: '11.11.0'
+  implementation group: 'io.hypersistence', name: 'hypersistence-utils-hibernate-63', version: '3.10.3'
 
   //database
   implementation 'org.postgresql:postgresql:42.7.7'

src/main/java/uk/gov/hmcts/darts/arm/client/ArmRpoClient.java

@@ -57,9 +57,8 @@ StorageAccountResponse getStorageAccounts(@RequestHeader(AUTHORIZATION) String b
         consumes = APPLICATION_JSON_VALUE, //NOSONAR
         produces = APPLICATION_JSON_VALUE //NOSONAR
     ) //NOSONAR
-    MasterIndexFieldByRecordClassSchemaResponse getMasterIndexFieldByRecordClassSchema( //NOSONAR
-                                                                                        @RequestHeader(AUTHORIZATION) String bearerAuth, //NOSONAR
-                                                                                        @RequestBody MasterIndexFieldByRecordClassSchemaRequest  //NOSONAR
+    MasterIndexFieldByRecordClassSchemaResponse getMasterIndexFieldByRecordClassSchema(@RequestHeader(AUTHORIZATION) String bearerAuth, //NOSONAR
+                                                                                       @RequestBody MasterIndexFieldByRecordClassSchemaRequest  //NOSONAR
                                                                                             masterIndexFieldByRecordClassSchemaRequest); //NOSONAR
 
     @PostMapping(value = "${darts.storage.arm-api.rpo-url.get-profile-entitlements-path}", //NOSONAR
@@ -107,9 +106,9 @@ ProductionOutputFilesResponse getProductionOutputFiles(@RequestHeader(AUTHORIZAT
         consumes = APPLICATION_JSON_VALUE, //NOSONAR
         produces = APPLICATION_JSON_VALUE //NOSONAR
     ) //NOSONAR
-    CreateExportBasedOnSearchResultsTableResponse createExportBasedOnSearchResultsTable( //NOSONAR
-                                                                                         @RequestHeader(AUTHORIZATION) String bearerToken,
-                                                                                         @RequestBody CreateExportBasedOnSearchResultsTableRequest request); //NOSONAR
+    CreateExportBasedOnSearchResultsTableResponse createExportBasedOnSearchResultsTable(@RequestHeader(AUTHORIZATION) String bearerToken, //NOSONAR
+                                                                                        @RequestBody 
+                                                                                            CreateExportBasedOnSearchResultsTableRequest request); //NOSONAR
 
     @PostMapping(value = "${darts.storage.arm-api.rpo-url.remove-production-path}", //NOSONAR
         consumes = APPLICATION_JSON_VALUE, //NOSONAR