remove wrong @Inject from DataStoreMetrics (and very minor clean up)

because instances of DataStoreMetrics are created explicitly via new by
the listeners in package org.opendaylight.genius.datastoreutils, but
never by Blueprint XML or annotations, the @Inject here is not needed,
and could be confusing to humans and tools in the future (and we could
never @Inject Class<?> anyway).

Change-Id: Ia361a59f468f4fb77d30610b02882b354c66b847
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/metrics/DataStoreMetrics.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/metrics/DataStoreMetrics.java
index 613a509aa855a820e816b5c7af74d7f2a5281664..d9b0aadaf3ae4a7ad29dc18774e81807524e977a 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/metrics/DataStoreMetrics.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/utils/metrics/DataStoreMetrics.java
@@ -7,28 +7,24 @@
  */
 package org.opendaylight.genius.utils.metrics;
 
-import javax.inject.Inject;
-
 import org.opendaylight.infrautils.metrics.Meter;
 import org.opendaylight.infrautils.metrics.MetricDescriptor;
 import org.opendaylight.infrautils.metrics.MetricProvider;
 
-
 public class DataStoreMetrics {
 
     private final MetricProvider metricProvider;
-    private final Class clazz;
+    private final Class<?> clazz;
     private final Meter added;
     private final Meter updated;
     private final Meter deleted;
 
-    @Inject
-    public DataStoreMetrics(MetricProvider metricProvider, Class clazz) {
+    public DataStoreMetrics(MetricProvider metricProvider, Class<?> clazz) {
         this.metricProvider = metricProvider;
         this.clazz = clazz;
-        added = initCounter("_added");
-        updated = initCounter("_updated");
-        deleted = initCounter("_deleted");
+        this.added = initCounter("_added");
+        this.updated = initCounter("_updated");
+        this.deleted = initCounter("_deleted");
     }
 
     public void incrementAdded() {
@@ -45,7 +41,7 @@ public class DataStoreMetrics {
 
     private Meter initCounter(String type) {
         String className = clazz.getSimpleName();
-        //expects the form org.opendaylight.project.module
+        // expects the form org.opendaylight.project.module
         String project = clazz.getName().split("\\.")[2];
         String module = clazz.getName().split("\\.")[3];
         return metricProvider.newMeter(new MetricDescriptor() {