Improve segmented journal actor metrics

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / DatastoreContextContextPropertiesUpdaterTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextContextPropertiesUpdaterTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextContextPropertiesUpdaterTest.java
index 88d1b8061fd5b6db146a3d3e56c4ff9658e03bbb..244df9c0bc0973d541e7cf0baf742d2b111df019 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextContextPropertiesUpdaterTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextContextPropertiesUpdaterTest.java
@@ -10,6 +10,8 @@ package org.opendaylight.controller.cluster.datastore;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.opendaylight.controller.cluster.datastore.DatastoreContextIntrospectorTest.INTROSPECTOR_FACTORY;
+import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
@@ -24,9 +26,8 @@ public class DatastoreContextContextPropertiesUpdaterTest {
     public void updateOnConstructionTest() throws Exception {
         final Map<String, Object> properties = new HashMap<>();
         properties.put("shardTransactionIdleTimeoutInMinutes", 10);
-        final DatastoreContext datastoreContext = DatastoreContext.newBuilder().build();
 
-        final DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(datastoreContext);
+        final DatastoreContextIntrospector introspector = INTROSPECTOR_FACTORY.newInstance(CONFIGURATION);
 
         final DatastoreContextPropertiesUpdater updater = new DatastoreContextPropertiesUpdater(introspector,
                 properties);
@@ -42,9 +43,8 @@ public class DatastoreContextContextPropertiesUpdaterTest {
     public void onUpdateTest() throws Exception {
         final Map<String, Object> properties = new HashMap<>();
         properties.put("shardTransactionIdleTimeoutInMinutes", 10);
-        final DatastoreContext datastoreContext = DatastoreContext.newBuilder().build();
-        assertNotNull(datastoreContext);
-        final DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(datastoreContext);
+
+        final DatastoreContextIntrospector introspector = INTROSPECTOR_FACTORY.newInstance(CONFIGURATION);
         assertNotNull(introspector);
         final DatastoreContextPropertiesUpdater updater = new DatastoreContextPropertiesUpdater(introspector,
                 properties);
@@ -66,8 +66,7 @@ public class DatastoreContextContextPropertiesUpdaterTest {
         final Map<String, Object> properties = new HashMap<>();
         properties.put("shardTransactionIdleTimeoutInMinutes", 10);
 
-        final DatastoreContext datastoreContext = DatastoreContext.newBuilder().build();
-        final DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(datastoreContext);
+        final DatastoreContextIntrospector introspector = INTROSPECTOR_FACTORY.newInstance(CONFIGURATION);
         final DatastoreContextPropertiesUpdater updater = new DatastoreContextPropertiesUpdater(introspector,
                 properties);
         final DummyListenerImpl dummyListener = new DummyListenerImpl();
@@ -83,17 +82,17 @@ public class DatastoreContextContextPropertiesUpdaterTest {
         updater.close();
     }
 
-    private Object resolveField(final String name, final Object obj) throws Exception {
+    private static Object resolveField(final String name, final Object obj) throws Exception {
         final Field currProps = obj.getClass().getDeclaredField(name);
         currProps.setAccessible(true);
         return currProps.get(obj);
     }
 
-    private class DummyListenerImpl implements Listener {
-
+    private static final class DummyListenerImpl implements Listener {
         private DatastoreContextFactory contextFactory;
 
         @Override
+        @SuppressWarnings("checkstyle:hiddenField")
         public void onDatastoreContextUpdated(final DatastoreContextFactory contextFactory) {
             this.contextFactory = contextFactory;
         }