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/main/java/uk/gov/hmcts/darts/arm/service/impl/ArmApiServiceImpl.java

@@ -1,7 +1,6 @@
 package uk.gov.hmcts.darts.arm.service.impl;
 
 import feign.FeignException;
-import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
@@ -30,14 +29,22 @@
 import static java.util.Objects.nonNull;
 
 @Service
-@RequiredArgsConstructor
+//@RequiredArgsConstructor
 @Slf4j
 public class ArmApiServiceImpl implements ArmApiService {
 
     private final ArmApiConfigurationProperties armApiConfigurationProperties;
     private final ArmDataManagementConfiguration armDataManagementConfiguration;
     private final ArmClientService armClientService;
 
+    public ArmApiServiceImpl(ArmApiConfigurationProperties armApiConfigurationProperties,
+                             ArmDataManagementConfiguration armDataManagementConfiguration,
+                             ArmClientService armClientService) {
+        this.armApiConfigurationProperties = armApiConfigurationProperties;
+        this.armDataManagementConfiguration = armDataManagementConfiguration;
+        this.armClientService = armClientService;
+    }
+
     @Override
     public UpdateMetadataResponse updateMetadata(String externalRecordId,
                                                  OffsetDateTime eventTimestamp,

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

@@ -1,9 +1,9 @@
 package uk.gov.hmcts.darts.arm.service.impl;
 
 import feign.Response;
-import lombok.RequiredArgsConstructor;
+import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 import uk.gov.hmcts.darts.arm.client.ArmApiClient;
 import uk.gov.hmcts.darts.arm.client.ArmRpoClient;
 import uk.gov.hmcts.darts.arm.client.ArmTokenClient;
@@ -38,9 +38,13 @@
  * 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.
  */
-@Service
-@ConditionalOnProperty(prefix = "darts.storage.arm.arm-api", name = "enable-arm-v5-2-upgrade", havingValue = "false", matchIfMissing = false)
-@RequiredArgsConstructor
+//@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})
+@AllArgsConstructor
 @SuppressWarnings({"PMD.CouplingBetweenObjects", "PMD.UseObjectForClearerAPI"})
 public class ArmClientServiceImpl implements ArmClientService {
 

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

@@ -1,9 +1,9 @@
 package uk.gov.hmcts.darts.arm.service.impl;
 
 import feign.Response;
-import lombok.RequiredArgsConstructor;
+import lombok.AllArgsConstructor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 import uk.gov.hmcts.darts.arm.client.model.ArmTokenRequest;
 import uk.gov.hmcts.darts.arm.client.model.ArmTokenResponse;
 import uk.gov.hmcts.darts.arm.client.model.AvailableEntitlementProfile;
@@ -37,9 +37,12 @@
  * 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.
  */
-@Service
+//@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")
-@RequiredArgsConstructor
+@AllArgsConstructor
 @SuppressWarnings({"PMD.CouplingBetweenObjects", "PMD.UseObjectForClearerAPI"})
 public class ArmClientServiceWrapper implements ArmClientService {