refactor(health): update health check interfaces and improve readiness status handling

Author: axgiri

…core/api/health/AbstractHealthCheck.java …/core/api/health/GenericHealthCheck.javasoftware/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/health/AbstractHealthCheck.java renamed to software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/health/GenericHealthCheck.java software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/health/AbstractHealthCheck.java renamed to software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/health/GenericHealthCheck.java

@@ -5,18 +5,26 @@
 import org.eclipse.microprofile.health.HealthCheckResponse;
 import org.eclipse.microprofile.health.HealthCheckResponseBuilder;
 
-public abstract class AbstractHealthCheck<T> implements HealthCheck {
-    abstract String getHealthCheckName();
-    abstract Instance<T> getProviders();
-    abstract HealthStatus getStatus(T provider);
+import java.util.function.Function;
+
+public class GenericHealthCheck<T> implements HealthCheck {
+    private final String healthCheckName;
+    private final Instance<T> providers;
+    private final Function<T, HealthStatus> statusGetter;
+
+    public GenericHealthCheck(String healthCheckName, Instance<T> providers, Function<T, HealthStatus> statusGetter) {
+        this.healthCheckName = healthCheckName;
+        this.providers = providers;
+        this.statusGetter = statusGetter;
+    }
 
     @Override
     public HealthCheckResponse call() {
-        HealthCheckResponseBuilder builder = HealthCheckResponse.named(getHealthCheckName());
+        HealthCheckResponseBuilder builder = HealthCheckResponse.named(this.healthCheckName);
         boolean allUp = true;
 
-        for (T provider : getProviders()) {
-            HealthStatus status = getStatus(provider);
+        for (T provider : this.providers) {
+            HealthStatus status = this.statusGetter.apply(provider);
             boolean up = status.isUp();
             allUp &= up;
             builder.withData(status.getName() + ".up", up);

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/health/HasLivenessCheck.java

@@ -13,10 +13,6 @@ public HealthStatus(String name) {
     }
 
     public void markUp(String message) {
-        statusMessage = message;
-    }
-
-    public void markCompleted(String message) {
         up = true;
         statusMessage = message;
     }

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/health/HasReadinessCheck.java

@@ -0,0 +1,18 @@
+package tech.ebp.oqm.core.api.health.service;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import org.eclipse.microprofile.health.Liveness;
+import tech.ebp.oqm.core.api.health.GenericHealthCheck;
+import tech.ebp.oqm.core.api.health.utils.HasLivenessCheck;
+
+@Liveness
+@ApplicationScoped
+public class LivenessHealthCheck extends GenericHealthCheck<HasLivenessCheck> {
+
+    @Inject
+    LivenessHealthCheck(Instance<HasLivenessCheck> providers) {
+        super("Service Health - Liveness", providers, HasLivenessCheck::getLivenessStatus);
+    }
+}

software/core/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/health/HasStartupCheck.java

@@ -0,0 +1,18 @@
+package tech.ebp.oqm.core.api.health.service;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Instance;
+import jakarta.inject.Inject;
+import org.eclipse.microprofile.health.Readiness;
+import tech.ebp.oqm.core.api.health.GenericHealthCheck;
+import tech.ebp.oqm.core.api.health.utils.HasReadinessCheck;
+
+@Readiness
+@ApplicationScoped
+public class ReadinessHealthCheck extends GenericHealthCheck<HasReadinessCheck> {
+
+    @Inject
+    ReadinessHealthCheck(Instance<HasReadinessCheck> providers) {
+        super("Service Health - Readiness", providers, HasReadinessCheck::getReadinessStatus);
+    }
+}