On conditional AAChannelProcessor configuration

Means the integration tests won't try to autowire it

Author: jacomago

src/main/java/org/phoebus/channelfinder/configuration/AAChannelProcessor.java

@@ -21,6 +21,7 @@
 import org.phoebus.channelfinder.service.model.archiver.aa.ArchiverInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Configuration;
 
 /**
@@ -31,6 +32,7 @@
  * <p>e.g. archive=monitor@1.0
  */
 @Configuration
+@ConditionalOnProperty(name = "aa.enabled", havingValue = "true")
 public class AAChannelProcessor implements ChannelProcessor {
 
   private static final Logger logger = Logger.getLogger(AAChannelProcessor.class.getName());

src/main/java/org/phoebus/channelfinder/service/external/ArchiverService.java

@@ -17,6 +17,7 @@
 import org.phoebus.channelfinder.service.model.archiver.aa.ArchivePVOptions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
@@ -25,6 +26,7 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 @Component
+@ConditionalOnProperty(name = "aa.enabled", havingValue = "true")
 public class ArchiverService {
   private static final Logger logger = Logger.getLogger(ArchiverService.class.getName());
   private static final int STATUS_BATCH_SIZE =

src/test/java/org/phoebus/channelfinder/processors/ChannelProcessorControllerIT.java

@@ -14,11 +14,13 @@
 import org.phoebus.channelfinder.entity.Scroll;
 import org.phoebus.channelfinder.rest.api.IChannelScroll;
 import org.phoebus.channelfinder.rest.controller.ChannelProcessorController;
+import org.phoebus.channelfinder.service.external.ArchiverService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.HttpHeaders;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
@@ -27,14 +29,15 @@
 @WebMvcTest(ChannelProcessorController.class)
 @TestPropertySource(
     value = "classpath:application_test.properties",
-    properties = {"elasticsearch.create.indices = false"})
+    properties = {"elasticsearch.create.indices = false", "aa.enabled=true"})
 class ChannelProcessorControllerIT {
 
   protected static final String AUTHORIZATION =
       "Basic " + Base64.getEncoder().encodeToString("admin:adminPass".getBytes());
 
   @Autowired protected MockMvc mockMvc;
   @MockBean IChannelScroll channelScroll;
+  @MockitoBean ArchiverService archiverService;
 
   @Test
   void testProcessorCount() throws Exception {