External api proposal

[openflowplugin.git] / applications / statistics-manager / src / main / java / org / opendaylight / openflowplugin / applications / statistics / manager / impl / StatAbstractNotifyCommit.java

diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractNotifyCommit.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractNotifyCommit.java
index 35f5b397bf8d27ac9298b56526162bc7f560804b..3ab5dbab42c2921278454f3418ebd928aaabcd00 100644 (file)
--- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractNotifyCommit.java
+++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatAbstractNotifyCommit.java
@@ -14,9 +14,9 @@ import java.util.concurrent.TimeoutException;
 
 import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
 import org.opendaylight.openflowplugin.applications.statistics.manager.StatNotifyCommiter;
-import org.opendaylight.openflowplugin.applications.statistics.manager.StatisticsManager;
 import org.opendaylight.openflowplugin.applications.statistics.manager.StatRpcMsgManager.TransactionCacheContainer;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionId;
+import org.opendaylight.openflowplugin.applications.statistics.manager.StatisticsManager;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.TransactionId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
@@ -42,6 +42,8 @@ public abstract class StatAbstractNotifyCommit<N extends NotificationListener> i
 
     private static final Logger LOG = LoggerFactory.getLogger(StatAbstractNotifyCommit.class);
 
+    private static final long MAX_WAIT_TIME = 10;
+
     protected final StatisticsManager manager;
     private ListenerRegistration<NotificationListener> notifyListenerRegistration;
 
@@ -59,7 +61,8 @@ public abstract class StatAbstractNotifyCommit<N extends NotificationListener> i
                 notifyListenerRegistration.close();
             }
             catch (final Exception e) {
-                LOG.error("Error by stop {} StatNotificationListener.", this.getClass().getSimpleName());
+                LOG.error("Error by stop {} StatNotificationListener. Exception {}",
+                        this.getClass().getSimpleName(), e);
             }
             notifyListenerRegistration = null;
         }
@@ -101,7 +104,7 @@ public abstract class StatAbstractNotifyCommit<N extends NotificationListener> i
     protected Optional<TransactionCacheContainer<?>> getTransactionCacheContainer(final TransactionId transId, final NodeId nodeId) {
         Optional<TransactionCacheContainer<?>> txContainer;
         try {
-            txContainer = manager.getRpcMsgManager().getTransactionCacheContainer(transId, nodeId).get(10, TimeUnit.SECONDS);
+            txContainer = manager.getRpcMsgManager().getTransactionCacheContainer(transId, nodeId).get(MAX_WAIT_TIME, TimeUnit.SECONDS);
         }
         catch (InterruptedException | ExecutionException | TimeoutException e) {
             LOG.warn("Get TransactionCacheContainer fail!", e);
@@ -145,7 +148,7 @@ public abstract class StatAbstractNotifyCommit<N extends NotificationListener> i
     protected boolean isExpectedStatistics(final TransactionId transId, final NodeId nodeId) {
         Boolean isExpectedStat = Boolean.FALSE;
         try {
-            isExpectedStat = manager.getRpcMsgManager().isExpectedStatistics(transId, nodeId).get(10, TimeUnit.SECONDS);
+            isExpectedStat = manager.getRpcMsgManager().isExpectedStatistics(transId, nodeId).get(MAX_WAIT_TIME, TimeUnit.SECONDS);
         }
         catch (InterruptedException | ExecutionException | TimeoutException e) {
             LOG.warn("Check Transaction registraion {} fail!", transId, e);