State value now comes from the MetricsServiceLifecycle bean.

hawkular · Jun 5, 2015 · 67c38e9 · 67c38e9
1 parent a7dfacf
commit 67c38e9
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/...-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/filter/MetricsServiceStateFilter.java b/...-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/filter/MetricsServiceStateFilter.java
@@ -16,22 +16,25 @@
  */
 package org.hawkular.metrics.api.jaxrs.filter;
 
-import javax.ws.rs.core.UriInfo;
-import org.hawkular.metrics.api.jaxrs.ApiError;
-import org.hawkular.metrics.api.jaxrs.handler.StatusHandler;
-import org.hawkular.metrics.core.api.MetricsService;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+
+import java.io.IOException;
 
 import javax.inject.Inject;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import javax.ws.rs.core.UriInfo;
 import javax.ws.rs.ext.Provider;
-import java.io.IOException;
 
-import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE;
+import org.hawkular.metrics.api.jaxrs.ApiError;
+import org.hawkular.metrics.api.jaxrs.MetricsServiceLifecycle;
+import org.hawkular.metrics.api.jaxrs.MetricsServiceLifecycle.State;
+import org.hawkular.metrics.api.jaxrs.handler.StatusHandler;
 
 /**
- * Created by mwringe on 20/05/15.
+ * @author Matt Wringe
  */
 @Provider
 public class MetricsServiceStateFilter implements ContainerRequestFilter {
@@ -41,8 +44,7 @@ public class MetricsServiceStateFilter implements ContainerRequestFilter {
     private static final String STOPPED = "The service is no longer running.";
 
     @Inject
-    private MetricsService metricsService;
-
+    private MetricsServiceLifecycle metricsServiceLifecycle;
 
     @Override
     public void filter(ContainerRequestContext containerRequestContext) throws IOException {
@@ -54,23 +56,23 @@ public void filter(ContainerRequestContext containerRequestContext) throws IOExc
             return;
         }
 
-        if (metricsService.getState() == MetricsService.State.STARTING) {
+        if (metricsServiceLifecycle.getState() == State.STARTING) {
             // Fail since the Cassandra cluster is not yet up yet.
-            Response response = Response.status(Response.Status.SERVICE_UNAVAILABLE)
+            Response response = Response.status(Status.SERVICE_UNAVAILABLE)
                     .type(APPLICATION_JSON_TYPE)
                     .entity(new ApiError(STARTING))
                     .build();
             containerRequestContext.abortWith(response);
-        } else if (metricsService.getState() == MetricsService.State.FAILED) {
+        } else if (metricsServiceLifecycle.getState() == State.FAILED) {
             // Fail since an error has occured trying to start the Metrics service
-            Response response = Response.status(Response.Status.INTERNAL_SERVER_ERROR)
+            Response response = Response.status(Status.INTERNAL_SERVER_ERROR)
                     .type(APPLICATION_JSON_TYPE)
                     .entity(new ApiError(FAILED))
                     .build();
             containerRequestContext.abortWith(response);
-        } else if (metricsService.getState() == MetricsService.State.STOPPED ||
-                metricsService.getState() == MetricsService.State.STOPPING ) {
-            Response response = Response.status(Response.Status.SERVICE_UNAVAILABLE)
+        } else if (metricsServiceLifecycle.getState() == State.STOPPED ||
+                   metricsServiceLifecycle.getState() == State.STOPPING) {
+            Response response = Response.status(Status.SERVICE_UNAVAILABLE)
                     .type(APPLICATION_JSON_TYPE)
                     .entity(new ApiError(STOPPED))
                     .build();

diff --git a/...metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/StatusHandler.java b/...metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/StatusHandler.java
@@ -18,15 +18,19 @@
 
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 
-import com.wordnik.swagger.annotations.ApiOperation;
 import java.util.HashMap;
 import java.util.Map;
+
 import javax.inject.Inject;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
-import org.hawkular.metrics.core.api.MetricsService;
+
+import org.hawkular.metrics.api.jaxrs.MetricsServiceLifecycle;
+import org.hawkular.metrics.api.jaxrs.MetricsServiceLifecycle.State;
+
+import com.wordnik.swagger.annotations.ApiOperation;
 
 /**
  * @author mwringe
@@ -38,17 +42,17 @@ public class StatusHandler {
     public static final String PATH = "/status";
 
     @Inject
-    private MetricsService metricsService;
+    private MetricsServiceLifecycle metricsServiceLifecycle;
 
     private static final String METRICSSERVICE_NAME = "MetricsService";
 
     @GET
     @ApiOperation(value = "Returns the current status for various components.",
                   response = String.class, responseContainer = "Map")
     public Response status() {
-        Map<String, Object> status = new HashMap();
+        Map<String, Object> status = new HashMap<>();
 
-        MetricsService.State metricState = metricsService.getState();
+        State metricState = metricsServiceLifecycle.getState();
         status.put(METRICSSERVICE_NAME, metricState.toString());
 
         return Response.ok(status).build();