DMP-5252-ARM-5-2-Upgrade

Started to move the ARM clients into a service so the current version and new version can be enabled accordingly

Author: karen-hedges

src/integrationTest/resources/application-intTest.yaml

@@ -85,9 +85,7 @@ darts:
       url: http://localhost:${wiremock.server.port}
       arm-service-entitlement: some-entitlement
       arm-storage-account-name: some-account-name
-
       enable-arm-v5-2-upgrade: false
-
       version5-2:
         authentication:
           auth-base-url: http://localhost:${wiremock.server.port}

src/main/java/uk/gov/hmcts/darts/arm/service/impl/ArmClientServiceImpl.java

@@ -38,12 +38,8 @@
  * Pre ARM version 5.2 implementation of the ArmClientService.
  * This implementation is activated when the property 'darts.storage.arm.arm-api.enable-arm-v5' is set to false.
  */
-//@Component
-//@ConditionalOnProperty(prefix = "darts.storage.arm", name = "is-mock-arm-rpo-download-csv", havingValue = "false")
-//@AllArgsConstructor
 @Component
-@ConditionalOnProperty(prefix = "darts.storage.arm.arm-api", name = "enable-arm-v5-2-upgrade", havingValue = "false")
-//@RequiredArgsConstructor(onConstructor_ = {@Autowired, @Lazy})
+@ConditionalOnProperty(prefix = "darts.storage.arm-api", name = "enable-arm-v5-2-upgrade", havingValue = "false")
 @AllArgsConstructor
 @SuppressWarnings({"PMD.CouplingBetweenObjects", "PMD.UseObjectForClearerAPI"})
 public class ArmClientServiceImpl implements ArmClientService {

src/main/java/uk/gov/hmcts/darts/arm/service/impl/ArmClientServiceWrapper.java

@@ -37,11 +37,8 @@
  * Post ARM version 5.2 implementation of the ArmClientService.
  * This implementation is activated when the property 'darts.storage.arm.arm-api.enable-arm-v5' is set to true.
  */
-//@Component
-//@ConditionalOnProperty(prefix = "darts.storage.arm", name = "is-mock-arm-rpo-download-csv", havingValue = "false")
-//@AllArgsConstructor
 @Component
-@ConditionalOnProperty(prefix = "darts.storage.arm.arm-api", name = "enable-arm-v5-2-upgrade", havingValue = "true")
+@ConditionalOnProperty(prefix = "darts.storage.arm-api", name = "enable-arm-v5-2-upgrade", havingValue = "true")
 @AllArgsConstructor
 @SuppressWarnings({"PMD.CouplingBetweenObjects", "PMD.UseObjectForClearerAPI"})
 public class ArmClientServiceWrapper implements ArmClientService {