Add 'TableStatistics' to SAL and Northbound Statistics API.

[controller.git] / opendaylight / sal / implementation / src / main / java / org / opendaylight / controller / sal / implementation / internal / DataPacketService.java

diff --git a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/DataPacketService.java b/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/DataPacketService.java
index fe525bb081f4db9c568da0975249f1f46879de9a..7741945e73db55a56a496444375747f146adaca0 100644 (file)
--- a/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/DataPacketService.java
+++ b/opendaylight/sal/implementation/src/main/java/org/opendaylight/controller/sal/implementation/internal/DataPacketService.java
@@ -31,7 +31,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.opendaylight.controller.sal.core.ConstructionException;
-import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.NodeConnector;
 import org.opendaylight.controller.sal.match.Match;
 import org.opendaylight.controller.sal.packet.Ethernet;
@@ -236,8 +235,7 @@ public class DataPacketService implements IPluginOutDataPacketService,
         logger.trace("Received setPluginInDataService request");
         for (Object e : props.entrySet()) {
             Map.Entry entry = (Map.Entry) e;
-            logger.trace("Prop key:(" + entry.getKey() + ") value:("
-                    + entry.getValue() + ")");
+            logger.trace("Prop key:({}) value:({})",entry.getKey(), entry.getValue());
         }
 
         Object value = props.get("protocolPluginType");
@@ -249,7 +247,7 @@ public class DataPacketService implements IPluginOutDataPacketService,
                     + "protocolPluginType provided");
         } else {
             this.pluginInDataService.put(type, s);
-            logger.debug("Stored the PluginInDataService for type:" + type);
+            logger.debug("Stored the PluginInDataService for type: {}", type);
         }
     }
 
@@ -263,8 +261,7 @@ public class DataPacketService implements IPluginOutDataPacketService,
         logger.trace("Received unsetPluginInDataService request");
         for (Object e : props.entrySet()) {
             Map.Entry entry = (Map.Entry) e;
-            logger.trace("Prop key:(" + entry.getKey() + ") value:("
-                    + entry.getValue() + ")");
+            logger.trace("Prop key:({}) value:({})",entry.getKey(), entry.getValue());
         }
 
         Object value = props.get("protocoloPluginType");
@@ -276,7 +273,7 @@ public class DataPacketService implements IPluginOutDataPacketService,
                     + "protocolPluginType provided");
         } else if (this.pluginInDataService.get(type).equals(s)) {
             this.pluginInDataService.remove(type);
-            logger.debug("Removed the PluginInDataService for type:" + type);
+            logger.debug("Removed the PluginInDataService for type: {}", type);
         }
     }
 
@@ -288,8 +285,7 @@ public class DataPacketService implements IPluginOutDataPacketService,
         logger.trace("Received setListenDataPacket request");
         for (Object e : props.entrySet()) {
             Map.Entry entry = (Map.Entry) e;
-            logger.trace("Prop key:(" + entry.getKey() + ") value:("
-                    + entry.getValue() + ")");
+            logger.trace("Prop key:({}) value:({})",entry.getKey(), entry.getValue());
         }
 
         String listenerName = null;
@@ -331,7 +327,7 @@ public class DataPacketService implements IPluginOutDataPacketService,
             if (this.indexDataPacket.contains(l)) {
                 logger.error("trying to add an existing element");
             } else {
-                logger.debug("adding listener: " + listenerName);
+                logger.debug("adding listener: {}", listenerName);
                 CopyOnWriteArrayList<DataPacketListener> serialListeners = new CopyOnWriteArrayList<DataPacketListener>();
                 serialListeners.add(l);
                 this.listenDataPacket.add(serialListeners);
@@ -343,7 +339,7 @@ public class DataPacketService implements IPluginOutDataPacketService,
             if (this.indexDataPacket.contains(l)) {
                 logger.error("trying to add an existing element");
             } else {
-                logger.debug("adding listener: " + listenerName);
+                logger.debug("adding listener: {}", listenerName);
                 // Lets find the set with the dependency in it, if we
                 // find it lets just add our dependency at the end of
                 // the list.
@@ -373,8 +369,7 @@ public class DataPacketService implements IPluginOutDataPacketService,
         logger.trace("Received UNsetListenDataPacket request");
         for (Object e : props.entrySet()) {
             Map.Entry entry = (Map.Entry) e;
-            logger.trace("Prop key:(" + entry.getKey() + ") value:("
-                    + entry.getValue() + ")");
+            logger.trace("Prop key:({}) value:({})",entry.getKey(), entry.getValue());
         }
 
         String listenerName = null;
@@ -395,7 +390,7 @@ public class DataPacketService implements IPluginOutDataPacketService,
         if (!this.indexDataPacket.contains(l)) {
             logger.error("trying to remove a non-existing element");
         } else {
-            logger.debug("removing listener: " + listenerName);
+            logger.debug("removing listener: {}", listenerName);
             for (List<DataPacketListener> serialListeners : this.listenDataPacket) {
                 int i = 0;
                 boolean done = false;
@@ -520,7 +515,7 @@ public class DataPacketService implements IPluginOutDataPacketService,
             try {
                 res.deserialize(data, 0, data.length * NetUtils.NumBitsInAByte);
             } catch (Exception e) {
-                logger.warn("", e);
+                logger.warn("Failed to decode packet: {}", e.getMessage());
             }
             return res;
         }
@@ -537,7 +532,7 @@ public class DataPacketService implements IPluginOutDataPacketService,
         try {
             data = pkt.serialize();
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.error("",e);
             return null;
         }
         if (data.length <= 0) {