Merge pull request #197 from ChannelFinder/remove-ignorable-error-logs

jacomago · web-flow · commit 7dc7fc1d99da · 2026-02-11T17:03:12.000+01:00
Remove ignorable error logs
diff --git a/src/main/java/org/phoebus/channelfinder/service/MetricsService.java b/src/main/java/org/phoebus/channelfinder/service/MetricsService.java
@@ -12,22 +12,20 @@
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import org.phoebus.channelfinder.repository.ChannelRepository;
 import org.phoebus.channelfinder.repository.PropertyRepository;
 import org.phoebus.channelfinder.repository.TagRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.PropertySource;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 @Service
-@PropertySource(value = "classpath:application.properties")
 public class MetricsService {
-
   public static final String CF_TOTAL_CHANNEL_COUNT = "cf.total.channel.count";
   public static final String CF_PROPERTY_COUNT = "cf.property.count";
   public static final String CF_TAG_COUNT = "cf.tag.count";
@@ -60,7 +58,7 @@ public class MetricsService {
 
   Map<String, List<String>> parseProperties() {
     if (metricProperties == null || metricProperties.isEmpty()) {
-      return new LinkedMultiValueMap<>();
+      return Map.of();
     }
     return Arrays.stream(metricProperties.split(";"))
         .map(
@@ -121,9 +119,7 @@ public static List<MultiValueMap<String, String>> generateAllMultiValueMaps(
     List<MultiValueMap<String, String>> allMultiValueMaps = new ArrayList<>();
 
     if (properties.isEmpty()) {
-      allMultiValueMaps.add(
-          new LinkedMultiValueMap<>()); // Add an empty map for the case where all are null
-      return allMultiValueMaps;
+      return List.of();
     }
 
     List<Entry<String, List<String>>> entries = new ArrayList<>(properties.entrySet());
@@ -211,7 +207,11 @@ private void updatePropertyMetrics() {
 
   @Scheduled(fixedRateString = "${metrics.updateInterval}", timeUnit = TimeUnit.SECONDS)
   public void updateMetrics() {
-    updateTagMetrics();
-    updatePropertyMetrics();
+    if (tagMetrics != null && !tagMetrics.isEmpty()) {
+      updateTagMetrics();
+    }
+    if (propertyMetrics != null && !propertyMetrics.isEmpty()) {
+      updatePropertyMetrics();
+    }
   }
 }
diff --git a/src/test/java/org/phoebus/channelfinder/AuthorizationIT.java b/src/test/java/org/phoebus/channelfinder/AuthorizationIT.java
@@ -11,10 +11,12 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 
 @WebMvcTest(AuthorizationService.class)
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {AuthorizationService.class})
 class AuthorizationIT {
   @Autowired AuthorizationService authorizationService;
 
diff --git a/src/test/java/org/phoebus/channelfinder/ChannelControllerIT.java b/src/test/java/org/phoebus/channelfinder/ChannelControllerIT.java
@@ -25,13 +25,16 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.server.ResponseStatusException;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(ChannelController.class)
 @WithMockUser(roles = "CF-ADMINS")
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(
+    classes = {ChannelController.class, ElasticConfig.class, ChannelRepository.class})
 class ChannelControllerIT {
 
   @Autowired IChannel channelManager;
diff --git a/src/test/java/org/phoebus/channelfinder/ChannelRepositoryIT.java b/src/test/java/org/phoebus/channelfinder/ChannelRepositoryIT.java
@@ -25,6 +25,7 @@
 import org.phoebus.channelfinder.repository.TagRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -33,6 +34,7 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(ChannelRepository.class)
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {ChannelRepository.class, ElasticConfig.class})
 class ChannelRepositoryIT {
 
   @Autowired ElasticConfig esService;
diff --git a/src/test/java/org/phoebus/channelfinder/ChannelRepositorySearchIT.java b/src/test/java/org/phoebus/channelfinder/ChannelRepositorySearchIT.java
@@ -25,13 +25,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(ChannelRepository.class)
 @TestPropertySource(locations = "classpath:application_test.properties")
+@ContextConfiguration(classes = {ChannelRepository.class, ElasticConfig.class})
 class ChannelRepositorySearchIT {
   private static final Logger logger = Logger.getLogger(ChannelRepositorySearchIT.class.getName());
 
diff --git a/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerIT.java b/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerIT.java
@@ -16,13 +16,15 @@
 import org.phoebus.channelfinder.rest.controller.ChannelScrollController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(ChannelScrollController.class)
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {ChannelScrollController.class, ElasticConfig.class})
 class ChannelScrollControllerIT {
 
   @Autowired IChannelScroll channelScroll;
diff --git a/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerSearchIT.java b/src/test/java/org/phoebus/channelfinder/ChannelScrollControllerSearchIT.java
@@ -18,13 +18,15 @@
 import org.phoebus.channelfinder.rest.controller.ChannelScrollController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(ChannelScrollController.class)
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {ChannelScrollController.class, ElasticConfig.class})
 class ChannelScrollControllerSearchIT {
 
   private static final Logger logger =
diff --git a/src/test/java/org/phoebus/channelfinder/ChannelValidationIT.java b/src/test/java/org/phoebus/channelfinder/ChannelValidationIT.java
@@ -22,13 +22,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.server.ResponseStatusException;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(ChannelController.class)
 @WithMockUser(roles = "CF-ADMINS")
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {ChannelController.class, ElasticConfig.class})
 class ChannelValidationIT {
 
   @Autowired IChannel channelManager;
diff --git a/src/test/java/org/phoebus/channelfinder/MetricsServiceIT.java b/src/test/java/org/phoebus/channelfinder/MetricsServiceIT.java
@@ -25,6 +25,7 @@
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.util.LinkedMultiValueMap;
@@ -41,6 +42,7 @@
       "metrics.properties=testProperty0: value0, value1; testProperty1: value0, !*",
       "metrics.updateInterval=1"
     })
+@ContextConfiguration(classes = {ElasticConfig.class, MetricsService.class})
 class MetricsServiceIT {
 
   public static final String METRICS_ENDPOINT = "/actuator/metrics";
@@ -69,11 +71,6 @@ void setupAll() {
     ElasticConfigIT.setUp(esService);
   }
 
-  @AfterAll
-  void tearDown() throws IOException {
-    ElasticConfigIT.teardown(esService);
-  }
-
   @AfterEach
   public void cleanup() {
     MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
diff --git a/src/test/java/org/phoebus/channelfinder/MetricsServiceTest.java b/src/test/java/org/phoebus/channelfinder/MetricsServiceTest.java
@@ -67,7 +67,7 @@ void testGenerateAllMultiValueMaps_emptyMap() {
     List<MultiValueMap<String, String>> allMaps =
         MetricsService.generateAllMultiValueMaps(properties);
 
-    assertEquals(1, allMaps.size());
+    assertEquals(0, allMaps.size());
   }
 
   // Helper method to create a MultiValueMap for easier assertion
diff --git a/src/test/java/org/phoebus/channelfinder/PropertyControllerIT.java b/src/test/java/org/phoebus/channelfinder/PropertyControllerIT.java
@@ -26,6 +26,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -35,6 +36,7 @@
 @WebMvcTest(PropertyController.class) // TODO Somehow creating one
 @WithMockUser(roles = "CF-ADMINS")
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {PropertyController.class, ElasticConfig.class})
 class PropertyControllerIT {
 
   @Autowired IProperty propertyManager;
diff --git a/src/test/java/org/phoebus/channelfinder/PropertyRepositoryIT.java b/src/test/java/org/phoebus/channelfinder/PropertyRepositoryIT.java
@@ -21,6 +21,7 @@
 import org.phoebus.channelfinder.repository.PropertyRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -29,6 +30,7 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(PropertyRepository.class)
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {PropertyRepository.class, ElasticConfig.class})
 class PropertyRepositoryIT {
   public static final String TEST_PROPERTY_NAME = "testProperty";
 
diff --git a/src/test/java/org/phoebus/channelfinder/PropertyValidationIT.java b/src/test/java/org/phoebus/channelfinder/PropertyValidationIT.java
@@ -19,13 +19,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.server.ResponseStatusException;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(PropertyController.class)
 @WithMockUser(roles = "CF-ADMINS")
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {PropertyController.class, ElasticConfig.class})
 class PropertyValidationIT {
 
   @Autowired IProperty propertyManager;
diff --git a/src/test/java/org/phoebus/channelfinder/TagRepositoryIT.java b/src/test/java/org/phoebus/channelfinder/TagRepositoryIT.java
@@ -19,6 +19,7 @@
 import org.phoebus.channelfinder.repository.TagRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -27,6 +28,7 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(TagRepository.class)
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {TagRepository.class, ElasticConfig.class})
 class TagRepositoryIT {
 
   @Autowired ElasticConfig esService;
diff --git a/src/test/java/org/phoebus/channelfinder/TagValidationIT.java b/src/test/java/org/phoebus/channelfinder/TagValidationIT.java
@@ -18,13 +18,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.server.ResponseStatusException;
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @WebMvcTest(TagController.class)
 @WithMockUser(roles = "CF-ADMINS")
 @TestPropertySource(value = "classpath:application_test.properties")
+@ContextConfiguration(classes = {TagController.class, ElasticConfig.class})
 class TagValidationIT {
 
   @Autowired ITag tagManager;
diff --git a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorIT.java b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorIT.java
@@ -28,7 +28,7 @@
 import org.springframework.test.context.TestPropertySource;
 
 @WebMvcTest(AAChannelProcessor.class)
-@TestPropertySource(value = "classpath:application_test.properties")
+@TestPropertySource(value = "classpath:application_aa_proc_test.properties")
 class AAChannelProcessorIT {
 
   protected static Property archiveProperty = new Property("archive", "owner", "default");
diff --git a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorMultiIT.java b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorMultiIT.java
@@ -32,7 +32,7 @@
 import org.springframework.test.context.TestPropertySource;
 
 @WebMvcTest(AAChannelProcessor.class)
-@TestPropertySource(value = "classpath:application_test.properties")
+@TestPropertySource(value = "classpath:application_aa_proc_test.properties")
 class AAChannelProcessorMultiIT {
 
   public static final String BEING_ARCHIVED = "Being archived";
diff --git a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoDefaultIT.java b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoDefaultIT.java
@@ -24,7 +24,7 @@
 
 @WebMvcTest(AAChannelProcessor.class)
 @TestPropertySource(
-    locations = "classpath:application_test.properties",
+    locations = "classpath:application_aa_proc_test.properties",
     properties = "aa.urls:{'default': '','aa': 'http://localhost:17665'}")
 class AAChannelProcessorNoDefaultIT {
   protected static Property archiverProperty = new Property("archiver", "owner", "aa");
diff --git a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoPauseIT.java b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorNoPauseIT.java
@@ -23,7 +23,7 @@
 
 @WebMvcTest(AAChannelProcessor.class)
 @TestPropertySource(
-    locations = "classpath:application_test.properties",
+    locations = "classpath:application_aa_proc_test.properties",
     properties = "aa.auto_pause=none")
 class AAChannelProcessorNoPauseIT {
 
diff --git a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorStatusPauseIT.java b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorStatusPauseIT.java
@@ -23,7 +23,7 @@
 
 @WebMvcTest(AAChannelProcessor.class)
 @TestPropertySource(
-    locations = "classpath:application_test.properties",
+    locations = "classpath:application_aa_proc_test.properties",
     properties = "aa.auto_pause=pvStatus")
 class AAChannelProcessorStatusPauseIT {
 
diff --git a/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorTagPauseIT.java b/src/test/java/org/phoebus/channelfinder/processors/aa/AAChannelProcessorTagPauseIT.java
@@ -23,7 +23,7 @@
 
 @WebMvcTest(AAChannelProcessor.class)
 @TestPropertySource(
-    locations = "classpath:application_test.properties",
+    locations = "classpath:application_aa_proc_test.properties",
     properties = "aa.auto_pause=archive")
 class AAChannelProcessorTagPauseIT {
 
diff --git a/src/test/resources/application_aa_proc_test.properties b/src/test/resources/application_aa_proc_test.properties
@@ -0,0 +1,38 @@
+
+logging.level.org.springframework.web=INFO
+
+############################## Service Info ###############################
+# ChannelFinder version as defined in the pom file
+channelfinder.version=@project.version@
+
+############################## REST Logging ###############################
+# DEBUG level will log all requests and responses to and from the REST end points
+logging.level.org.springframework.web.filter.CommonsRequestLoggingFilter=INFO
+
+################ Processor ##################################################
+processors.chunking.size=10000
+
+################ Archiver Appliance Configuration Processor #################
+aa.urls={'default': 'http://localhost:17665'}
+aa.default_alias=default
+aa.enabled=true
+aa.pva=false
+aa.archive_property_name=archive
+aa.archiver_property_name=archiver
+
+# Set the auto pause behaviour
+#
+# Empty for no auto pause
+# Or pvStatus to pause on pvStatus=Inactive
+# Or match archive_property_name to pause on archive_property_name not existing
+# Or both, i.e. aa.auto_pause=pvStatus,archive
+#
+aa.auto_pause=pvStatus,archive
+
+
+############################## Metrics ###############################
+#actuator
+management.endpoints.web.exposure.include=prometheus, metrics, health, info
+metrics.tags=
+metrics.properties=
+metrics.updateInterval=1
diff --git a/src/test/resources/application_test.properties b/src/test/resources/application_test.properties
diff --git a/src/test/resources/application_test_multi.properties b/src/test/resources/application_test_multi.properties

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ void testGenerateAllMultiValueMaps_emptyMap() {`
`67`	`67`	`List<MultiValueMap<String, String>> allMaps =`
`68`	`68`	`MetricsService.generateAllMultiValueMaps(properties);`
`69`	`69`
`70`		`- assertEquals(1, allMaps.size());`
	`70`	`+ assertEquals(0, allMaps.size());`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// Helper method to create a MultiValueMap for easier assertion`