commit 9e75f8b32ec1758b451ceea0a7e4a12cfdc7e340
author Georgios Katsikas <katsikas.gp@gmail.com> Sun Mar 22 11:47:13 2020 +0100
committer Georgios Katsikas <katsikas.gp@gmail.com> Thu May 28 21:19:18 2020 +0200
tree 4966fa0777963a01bf97667647c9d1fd4417b4ae
parent fbec099737bee20e818aad7f41af659e04326064

Updated toString methods

* Added toString() in DefaultDeviceInterfaceDescription
* Updated toString() in DefaultTableStatisticsEntry
* Removed unecessary space in DeviceSystemStatisticsQuery

Change-Id: Ib4536d3f10d6c9e2e4805887186e57f5ab321fd8
Signed-off-by: Georgios Katsikas <katsikas.gp@gmail.com>

core/api/src/main/java/org/onosproject/net/device/DefaultDeviceInterfaceDescription.java

diff --git a/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceInterfaceDescription.java b/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceInterfaceDescription.java
index f3b38c9..7e5f8e6 100644
--- a/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceInterfaceDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceInterfaceDescription.java
@@ -22,6 +22,8 @@
 import java.util.List;
 import java.util.Objects;
 
+import static com.google.common.base.MoreObjects.toStringHelper;
+
 /**
  * Basic implementation of description of a legacy device interface.
  */
@@ -127,4 +129,17 @@
     public int hashCode() {
         return Objects.hash(name, mode, vlans, isRateLimited, rateLimit);
     }
+
+    @Override
+    public String toString() {
+        return toStringHelper(this)
+                .omitNullValues()
+                .add("Device name", name())
+                .add("Device mode", mode())
+                .add("VLAN IDs", vlans())
+                .add("Rate limited", isRateLimited())
+                .add("Rate limit", rateLimit())
+                .toString();
+    }
+
 }

core/api/src/main/java/org/onosproject/net/flow/DefaultTableStatisticsEntry.java

diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultTableStatisticsEntry.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultTableStatisticsEntry.java
index e84b343..ccce84e 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/DefaultTableStatisticsEntry.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultTableStatisticsEntry.java
@@ -16,6 +16,8 @@
 package org.onosproject.net.flow;
 
 import org.onosproject.net.DeviceId;
+import com.google.common.base.MoreObjects.ToStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
@@ -57,11 +59,21 @@
 
     @Override
     public String toString() {
-        return "device: " + deviceId + ", " +
-                "tableId: " + this.tableId + ", " +
-                "activeEntries: " + this.activeFlowEntries + ", " +
-                "packetsLookedUp: " + this.packetsLookedupCount + ", " +
-                "packetsMatched: " + this.packetsMatchedCount;
+        ToStringHelper toStringHelper = toStringHelper(this);
+        toStringHelper
+            .omitNullValues()
+            .add("Device ID", deviceId)
+            .add("Table ID", tableId)
+            .add("Active entries", activeFlowEntries);
+        if (hasPacketsLookedup()) {
+            toStringHelper.add("Packets looked-up", packetsLookedupCount);
+        }
+        toStringHelper.add("Packets matched", packetsMatchedCount);
+        if (hasMaxSize()) {
+            toStringHelper.add("Max size", maxSize);
+        }
+
+        return toStringHelper.toString();
     }
 
     @Override
@@ -163,4 +175,4 @@
         }
     }
 
-}
\ No newline at end of file
+}