FELIX-6448 : Simplify result cache for components check

Author: cziegeler

healthcheck/generalchecks/src/main/java/org/apache/felix/hc/generalchecks/DsComponentsCheck.java

@@ -47,7 +47,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Component(configurationPolicy = ConfigurationPolicy.REQUIRE)
+@Component(configurationPolicy = ConfigurationPolicy.REQUIRE, immediate = true)
 @HealthCheckService(name = DsComponentsCheck.HC_NAME, tags = { DsComponentsCheck.HC_DEFAULT_TAG })
 @Designate(ocd = DsComponentsCheck.Config.class, factory = true)
 public class DsComponentsCheck implements HealthCheck {
@@ -175,7 +175,9 @@ public Result execute() {
                 log.info("{} required components are active", countEnabled);
             }
             result = new Result(log);
-            this.cache.set(result);
+            if ( result.isOk() ) {
+                this.cache.set(result);
+            }
         }
         return result;
     }
@@ -200,7 +202,7 @@ static final String toStateString(int state) {
         }
     }
 
-    @Reference(updated = "updatedServiceComponentRuntime")
+    @Reference(name = "scr", updated = "updatedServiceComponentRuntime")
     private void setServiceComponentRuntime(final ServiceComponentRuntime c) {
         this.scr = c;
     }

systemready/src/main/java/org/apache/felix/systemready/SystemReadyCheck.java

@@ -24,7 +24,7 @@
  *
  * Examples: An asynchronous integration with another instance or a third-party service
  *
- * {@see SystemReadyMonitor}
+ * @see SystemReadyMonitor
  *
  * This framework is deprecated.
  * @deprecated Use the Apache Felix Healthchecks instead.

systemready/src/main/java/org/apache/felix/systemready/impl/ComponentsCheck.java

@@ -104,7 +104,7 @@ private List<DSComp> getComponents(final Collection<ComponentDescriptionDTO> des
                 .collect(Collectors.toList());
         } catch (Throwable e) {
             // exception might occur on shutdown or startup
-            log.warn("Exception while getting ds component dtos {}", e.getMessage(), e);
+            log.info("Exception while getting ds component dtos {}", e.getMessage(), e);
             return null;
         }
     }
@@ -128,18 +128,20 @@ public CheckStatus getStatus() {
                     watchedComps.stream().forEach(dsComp -> addDetails(dsComp, details));
                     final CheckStatus.State state = CheckStatus.State.worstOf(watchedComps.stream().map(this::status));
                     result = new CheckStatus(getName(), type, state, details.toString());
-                } catch (Throwable e) {
+                } catch (final Throwable e) {
                     // exception might occur on shutdown or startup
-                    log.warn("Exception while checking ds component dtos {}", e.getMessage(), e);
+                    log.info("Exception while checking ds component dtos {}", e.getMessage(), e);
                     result = new CheckStatus(getName(), type, CheckStatus.State.RED, "Exception while checking ds component dtos : " + e.getMessage());
                 }
             }
-            this.cache.set(result);
+            if ( result.getState() == CheckStatus.State.GREEN ) {
+                this.cache.set(result);
+            }
         }
         return result;
      }
 
-    private CheckStatus.State status(DSComp component) {
+    private CheckStatus.State status(final DSComp component) {
         boolean missingConfig = component.config == null && "require".equals(component.desc.configurationPolicy);
         boolean unsatisfied = !component.unsatisfied.isEmpty();
         return (missingConfig || unsatisfied) ? CheckStatus.State.YELLOW : CheckStatus.State.GREEN;
@@ -150,7 +152,7 @@ private void addDetails(final DSComp component, final StringBuilder details) {
         printer.print(component);
     }
 
-    @Reference(updated = "updatedServiceComponentRuntime")
+    @Reference(name = "scr", updated = "updatedServiceComponentRuntime")
     private void setServiceComponentRuntime(final ServiceComponentRuntime c) {
         this.scr = c;
     }