make DataStoreMetrics package local instead of a publicly supported API

and, exceptionally, keep it copy/pasted into the old (mdsalutil) and new
place (genius.tools); this IMHO is, exceptionally, better than keeping
something public - hopefully the duplicate in the old package will be
removed soon-ish, anyway.

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

diff --git a/api/src/main/java/org/opendaylight/genius/tools/mdsal/listener/AbstractDataTreeChangeListener.java b/api/src/main/java/org/opendaylight/genius/tools/mdsal/listener/AbstractDataTreeChangeListener.java
index 9b3a563989310ba16bddbe355282bec54143a5b3..3e6c49b8f450f9f20674b2cf6a2761f3a667e12f 100644 (file)
--- a/api/src/main/java/org/opendaylight/genius/tools/mdsal/listener/AbstractDataTreeChangeListener.java
+++ b/api/src/main/java/org/opendaylight/genius/tools/mdsal/listener/AbstractDataTreeChangeListener.java
@@ -15,7 +15,6 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.tools.mdsal.metrics.DataStoreMetrics;
 import org.opendaylight.infrautils.metrics.MetricProvider;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.DataObject;

diff --git a/api/src/main/java/org/opendaylight/genius/tools/mdsal/metrics/DataStoreMetrics.java b/api/src/main/java/org/opendaylight/genius/tools/mdsal/listener/DataStoreMetrics.java
similarity index 86%
rename from api/src/main/java/org/opendaylight/genius/tools/mdsal/metrics/DataStoreMetrics.java
rename to api/src/main/java/org/opendaylight/genius/tools/mdsal/listener/DataStoreMetrics.java
index 5253356839542a3687d2f114811138cc3124d205..aa48ae2627440786a24ecc2c76dd5691e60553da 100644 (file)
--- a/api/src/main/java/org/opendaylight/genius/tools/mdsal/metrics/DataStoreMetrics.java
+++ b/api/src/main/java/org/opendaylight/genius/tools/mdsal/listener/DataStoreMetrics.java
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.genius.tools.mdsal.metrics;
+package org.opendaylight.genius.tools.mdsal.listener;
 
 import org.opendaylight.infrautils.metrics.Meter;
 import org.opendaylight.infrautils.metrics.MetricDescriptor;
 import org.opendaylight.infrautils.metrics.MetricProvider;
 
-public class DataStoreMetrics {
+/* intentionally *NOT* public */ class DataStoreMetrics {
 
     private final MetricProvider metricProvider;
     private final Class<?> clazz;
@@ -19,7 +19,7 @@ public class DataStoreMetrics {
     private final Meter updated;
     private final Meter deleted;
 
-    public DataStoreMetrics(MetricProvider metricProvider, Class<?> clazz) {
+    DataStoreMetrics(MetricProvider metricProvider, Class<?> clazz) {
         this.metricProvider = metricProvider;
         this.clazz = clazz;
         this.added = initCounter("_added");
@@ -27,15 +27,15 @@ public class DataStoreMetrics {
         this.deleted = initCounter("_deleted");
     }
 
-    public void incrementAdded() {
+    void incrementAdded() {
         added.mark();
     }
 
-    public void incrementUpdated() {
+    void incrementUpdated() {
         updated.mark();
     }
 
-    public void incrementDeleted() {
+    void incrementDeleted() {
         deleted.mark();
     }
 

diff --git a/api/src/main/java/org/opendaylight/genius/tools/mdsal/listener/DataTreeChangeListenerActions.java b/api/src/main/java/org/opendaylight/genius/tools/mdsal/listener/DataTreeChangeListenerActions.java
index 7734c3cf30231a376b532a6974ac82ec48a86806..a744d256acf0f68847b108eea3bdb5438b8a57db 100644 (file)
--- a/api/src/main/java/org/opendaylight/genius/tools/mdsal/listener/DataTreeChangeListenerActions.java
+++ b/api/src/main/java/org/opendaylight/genius/tools/mdsal/listener/DataTreeChangeListenerActions.java
@@ -12,7 +12,6 @@ import javax.annotation.Nonnull;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
-import org.opendaylight.genius.tools.mdsal.metrics.DataStoreMetrics;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;