External api proposal

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

diff --git a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatisticsManagerImpl.java b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatisticsManagerImpl.java
index e70a71ddd00b38296c95a3434b6fb5cc33283500..9d9446426e1ae6342d948768ef47da4a56f7b677 100644 (file)
--- a/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatisticsManagerImpl.java
+++ b/applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/StatisticsManagerImpl.java
@@ -28,15 +28,15 @@ import org.opendaylight.openflowplugin.applications.statistics.manager.StatListe
 import org.opendaylight.openflowplugin.applications.statistics.manager.StatNodeRegistration;
 import org.opendaylight.openflowplugin.applications.statistics.manager.StatNotifyCommiter;
 import org.opendaylight.openflowplugin.applications.statistics.manager.StatPermCollector;
+import org.opendaylight.openflowplugin.applications.statistics.manager.StatPermCollector.StatCapabTypes;
 import org.opendaylight.openflowplugin.applications.statistics.manager.StatRpcMsgManager;
 import org.opendaylight.openflowplugin.applications.statistics.manager.StatisticsManager;
-import org.opendaylight.openflowplugin.applications.statistics.manager.StatPermCollector.StatCapabTypes;
 import org.opendaylight.openflowplugin.applications.statistics.manager.StatisticsManager.StatDataStoreOperation.StatsManagerOperationType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.meters.Meter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.OpendaylightFlowStatisticsListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.table.statistics.rev131215.OpendaylightFlowTableStatisticsListener;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.TransactionId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.queues.Queue;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.OpendaylightGroupStatisticsListener;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group;
@@ -123,33 +123,34 @@ public class StatisticsManagerImpl implements StatisticsManager, Runnable {
        LOG.info("Statistics Manager started successfully!");
    }
 
-   private <T extends AutoCloseable> T closeClosable(final T closeable) throws Exception {
+   private <T extends AutoCloseable> T close(final T closeable) throws Exception {
        if (closeable != null) {
            closeable.close();
        }
        return null;
    }
+
    @Override
    public void close() throws Exception {
        LOG.info("StatisticsManager close called");
        finishing = true;
-       nodeRegistrator = closeClosable(nodeRegistrator);
-       flowListeningCommiter = closeClosable(flowListeningCommiter);
-       meterListeningCommiter = closeClosable(meterListeningCommiter);
-       groupListeningCommiter = closeClosable(groupListeningCommiter);
-       tableNotifCommiter = closeClosable(tableNotifCommiter);
-       portNotifyCommiter = closeClosable(portNotifyCommiter);
-       queueNotifyCommiter = closeClosable(queueNotifyCommiter);
+       nodeRegistrator = close(nodeRegistrator);
+       flowListeningCommiter = close(flowListeningCommiter);
+       meterListeningCommiter = close(meterListeningCommiter);
+       groupListeningCommiter = close(groupListeningCommiter);
+       tableNotifCommiter = close(tableNotifCommiter);
+       portNotifyCommiter = close(portNotifyCommiter);
+       queueNotifyCommiter = close(queueNotifyCommiter);
        if (statCollectors != null) {
            for (StatPermCollector collector : statCollectors) {
-               collector = closeClosable(collector);
+               collector = close(collector);
            }
            statCollectors = null;
        }
-       rpcMsgManager = closeClosable(rpcMsgManager);
+       rpcMsgManager = close(rpcMsgManager);
        statRpcMsgManagerExecutor.shutdown();
        statDataStoreOperationServ.shutdown();
-       txChain = closeClosable(txChain);
+       txChain = close(txChain);
    }
 
    @Override
@@ -212,7 +213,7 @@ public class StatisticsManagerImpl implements StatisticsManager, Runnable {
                    op.applyOperation(null);
                } catch (final Exception e) {
                    LOG.warn("Unhandled exception while cleaning up internal data of node [{}]. "
-                           + "Exception %s was raised",op.getNodeId(), e.getMessage());
+                           + "Exception {}",op.getNodeId(), e);
                }
            }
        }