Move boot metric to rest full

spring-security-rest-full/src/main/java/org/baeldung/spring/Application.java

@@ -0,0 +1,23 @@
+package org.baeldung.spring;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+/**
+ * Main Application Class - uses Spring Boot. Just run this as a normal Java
+ * class to run up a Jetty Server (on http://localhost:8080)
+ *
+ */
+@EnableScheduling
+@EnableAutoConfiguration
+@ComponentScan("org.baeldung")
+public class Application extends WebMvcConfigurerAdapter {
+
+    public static void main(final String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+}

spring-security-rest-full/src/main/java/org/baeldung/web/controller/RootController.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.baeldung.web.metric.IActuatorMetricService;
 import org.baeldung.web.metric.IMetricService;
 import org.baeldung.web.util.LinkUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +24,9 @@ public class RootController {
     @Autowired
     private IMetricService metricService;
 
+    @Autowired
+    private IActuatorMetricService actMetricService;
+
     public RootController() {
         super();
     }
@@ -62,4 +66,10 @@ public class RootController {
         }
         return result;
     }
+
+    @RequestMapping(value = "/metric-graph-data", method = RequestMethod.GET)
+    @ResponseBody
+    public Object[][] getActuatorMetricData() {
+        return actMetricService.getGraphData();
+    }
 }

spring-security-rest-full/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java

@@ -0,0 +1,91 @@
+package org.baeldung.web.metric;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.metrics.CounterService;
+import org.springframework.boot.actuate.metrics.Metric;
+import org.springframework.boot.actuate.metrics.repository.MetricRepository;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ActuatorMetricService implements IActuatorMetricService {
+
+    @Autowired
+    private MetricRepository repo;
+
+    @Autowired
+    private CounterService counter;
+
+    private final List<ArrayList<Integer>> statusMetric;
+    private final List<String> statusList;
+    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+    public ActuatorMetricService() {
+        super();
+        statusMetric = new ArrayList<ArrayList<Integer>>();
+        statusList = new ArrayList<String>();
+    }
+
+    // API
+
+    @Override
+    public void increaseCount(final int status) {
+        counter.increment("status." + status);
+        if (!statusList.contains("counter.status." + status)) {
+            statusList.add("counter.status." + status);
+        }
+    }
+
+    @Override
+    public Object[][] getGraphData() {
+        final Date current = new Date();
+        final int colCount = statusList.size() + 1;
+        final int rowCount = statusMetric.size() + 1;
+        final Object[][] result = new Object[rowCount][colCount];
+        result[0][0] = "Time";
+
+        int j = 1;
+        for (final String status : statusList) {
+            result[0][j] = status;
+            j++;
+        }
+
+        List<Integer> temp;
+        for (int i = 1; i < rowCount; i++) {
+            temp = statusMetric.get(i - 1);
+            result[i][0] = dateFormat.format(new Date(current.getTime() - (60000 * (rowCount - i))));
+            for (j = 1; j <= temp.size(); j++) {
+                result[i][j] = temp.get(j - 1);
+            }
+            while (j < colCount) {
+                result[i][j] = 0;
+                j++;
+            }
+        }
+        return result;
+    }
+
+    // Non - API
+
+    @Scheduled(fixedDelay = 60000)
+    private void exportMetrics() {
+        Metric<?> metric;
+        final ArrayList<Integer> statusCount = new ArrayList<Integer>();
+        for (final String status : statusList) {
+            metric = repo.findOne(status);
+            if (metric != null) {
+                statusCount.add(metric.getValue().intValue());
+                repo.reset(status);
+            } else {
+                statusCount.add(0);
+            }
+
+        }
+        statusMetric.add(statusCount);
+    }
+}

spring-security-rest-full/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java

@@ -0,0 +1,8 @@
+package org.baeldung.web.metric;
+
+public interface IActuatorMetricService {
+
+    void increaseCount(final int status);
+
+    Object[][] getGraphData();
+}

spring-security-rest-full/src/main/java/org/baeldung/web/metric/MetricFilter.java

@@ -9,15 +9,20 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.springframework.web.context.support.WebApplicationContextUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
+@Component
 public class MetricFilter implements Filter {
 
-    private MetricService metricService;
+    @Autowired
+    private IMetricService metricService;
+
+    @Autowired
+    private IActuatorMetricService actMetricService;
 
     @Override
     public void init(final FilterConfig config) throws ServletException {
-        metricService = (MetricService) WebApplicationContextUtils.getRequiredWebApplicationContext(config.getServletContext()).getBean("metricService");
     }
 
     @Override
@@ -29,6 +34,7 @@ public class MetricFilter implements Filter {
 
         final int status = ((HttpServletResponse) response).getStatus();
         metricService.increaseCount(req, status);
+        actMetricService.increaseCount(status);
     }
 
     @Override