[HWKMETRICS-185] Add back the injection annotation for Metrics Service.

hawkular · Aug 13, 2015 · 2c343f8 · 2c343f8
1 parent ff2084d
commit 2c343f8
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/api/metrics-api-jaxrs-1.1/pom.xml b/api/metrics-api-jaxrs-1.1/pom.xml
@@ -65,7 +65,7 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxrs</artifactId>
@@ -79,6 +79,12 @@
       <version>1.0.2.Final</version>
     </dependency>
 
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
+
     <dependency>
       <groupId>io.reactivex</groupId>
       <artifactId>rxjava</artifactId>
@@ -88,7 +94,7 @@
       <groupId>io.reactivex</groupId>
       <artifactId>rxjava-math</artifactId>
     </dependency>
-    
+
     <!-- documentation -->
     <dependency>
       <groupId>com.wordnik</groupId>

diff --git a/...i-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java b/...i-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
@@ -30,6 +30,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.DefaultValue;
@@ -88,6 +89,7 @@ public class AvailabilityHandler {
 
     private static final Logger logger = LoggerFactory.getLogger(AvailabilityHandler.class);
 
+    @Inject
     private MetricsService metricsService;
 
     @HeaderParam(TenantFilter.TENANT_HEADER_NAME)

diff --git a/...cs-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java b/...cs-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java
@@ -27,6 +27,7 @@
 import java.net.URI;
 import java.util.List;
 
+import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.HeaderParam;
@@ -76,6 +77,7 @@ public class CounterHandler {
 
     private static final long EIGHT_HOURS = MILLISECONDS.convert(8, HOURS);
 
+    @Inject
     private MetricsService metricsService;
 
     @HeaderParam(TENANT_HEADER_NAME)

diff --git a/...rics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java b/...rics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
@@ -30,6 +30,7 @@
 import java.util.Map;
 import java.util.function.Predicate;
 
+import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.GET;
@@ -79,6 +80,7 @@
 public class GaugeHandler {
     private static final long EIGHT_HOURS = MILLISECONDS.convert(8, HOURS);
 
+    @Inject
     private MetricsService metricsService;
 
     @HeaderParam(TENANT_HEADER_NAME)

diff --git a/...ics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java b/...ics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
@@ -27,6 +27,7 @@
 import java.util.Collection;
 import java.util.List;
 
+import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.HeaderParam;
@@ -69,6 +70,7 @@
 @Api(value = "", description = "Metrics related REST interface")
 public class MetricHandler {
 
+    @Inject
     private MetricsService metricsService;
 
     @HeaderParam(TENANT_HEADER_NAME)

diff --git a/...cs-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/TenantsHandler.java b/...cs-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/TenantsHandler.java
@@ -20,6 +20,7 @@
 
 import java.net.URI;
 
+import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
@@ -54,8 +55,7 @@
 @Api(value = "/tenants", description = "Tenants related REST interface")
 public class TenantsHandler {
 
-    // TODO: add back retention settings
-
+    @Inject
     private MetricsService metricsService;
 
     @POST