From 6b0e7e1c00f010b2bd13e43ecc0ba9da777c956a Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Mon, 3 Jun 2013 18:02:19 -0500 Subject: [PATCH] Rooted out the last of the ReflectionToStringBuilder usage Change-Id: I0597e09797f30a43354902ee7e4a6d1477b1627d Signed-off-by: Ed Warnicke --- .../hostAware/HostNodeConnector.java | 10 +---- .../core/internal/PriorityMessage.java | 1 - .../v6extension/V6FlowMod.java | 12 +++--- .../vendorextension/v6extension/V6Match.java | 38 +++++++++++++++---- .../v6extension/V6StatsRequest.java | 4 +- .../controller/sal/core/MacAddress.java | 6 +-- .../sal/packet/address/DataLinkAddress.java | 5 +-- .../sal/packet/address/EthernetAddress.java | 3 +- .../sal/topology/TopoEdgeUpdate.java | 5 +-- .../controller/switchmanager/Switch.java | 6 ++- 10 files changed, 52 insertions(+), 38 deletions(-) diff --git a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java index 5d9a5e1803..8345b5adbc 100644 --- a/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java +++ b/opendaylight/hosttracker/api/src/main/java/org/opendaylight/controller/hosttracker/hostAware/HostNodeConnector.java @@ -18,7 +18,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.opendaylight.controller.sal.core.ConstructionException; import org.opendaylight.controller.sal.core.Host; import org.opendaylight.controller.sal.core.Node; @@ -172,15 +171,10 @@ public class HostNodeConnector extends Host { return !Arrays.equals(emptyArray, macaddr); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @Override public String toString() { - return "HostNodeConnector[" + ReflectionToStringBuilder.toString(this) - + "]"; + return "HostNodeConnector [nodeConnector=" + nodeConnector + ", vlan=" + + vlan + ", staticHost=" + staticHost + "]"; } public boolean isV4Host() { diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/PriorityMessage.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/PriorityMessage.java index 0386ef6f74..7893ae0acc 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/PriorityMessage.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/core/internal/PriorityMessage.java @@ -10,7 +10,6 @@ package org.opendaylight.controller.protocol_plugin.openflow.core.internal; import java.util.concurrent.atomic.AtomicLong; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.openflow.protocol.OFMessage; /** diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6FlowMod.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6FlowMod.java index 81ee6dc070..f7edd30b01 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6FlowMod.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6FlowMod.java @@ -13,7 +13,6 @@ import java.nio.ByteBuffer; import java.util.LinkedList; import java.util.List; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.openflow.protocol.OFPacketOut; import org.openflow.protocol.OFPort; import org.openflow.protocol.OFVendor; @@ -229,12 +228,15 @@ public class V6FlowMod extends OFVendor implements Cloneable { } } - /** - * Prints the contents of V6FlowMod in a string format. - */ @Override public String toString() { - return "V6FlowMod[" + ReflectionToStringBuilder.toString(this) + "]"; + return "V6FlowMod [match=" + match + ", cookie=" + cookie + + ", command=" + command + ", idleTimeout=" + idleTimeout + + ", hardTimeout=" + hardTimeout + ", priority=" + priority + + ", bufferId=" + bufferId + ", outPort=" + outPort + + ", flags=" + flags + ", actions=" + actions + ", match_len=" + + match_len + ", actions_len=" + actions_len + ", pad_size=" + + pad_size + "]"; } } diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Match.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Match.java index 0edcfead0c..f31e079bc7 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Match.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6Match.java @@ -9,18 +9,16 @@ package org.opendaylight.controller.protocol_plugin.openflow.vendorextension.v6extension; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.openflow.protocol.OFMatch; -import org.openflow.util.U16; -import org.openflow.util.U8; - import java.net.Inet6Address; -import org.opendaylight.controller.sal.utils.HexEncode; - import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.ByteBuffer; +import java.util.Arrays; +import org.opendaylight.controller.sal.utils.HexEncode; +import org.openflow.protocol.OFMatch; +import org.openflow.util.U16; +import org.openflow.util.U8; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1013,7 +1011,31 @@ public class V6Match extends OFMatch implements Cloneable { @Override public String toString() { - return "V6Match[" + ReflectionToStringBuilder.toString(this) + "]"; + return "V6Match [nwSrc=" + nwSrc + ", nwDst=" + nwDst + + ", inputPortMask=" + inputPortMask + ", dataLayerSourceMask=" + + HexEncode.bytesToHexStringFormat(dataLayerSourceMask) + + ", dataLayerDestinationMask=" + + HexEncode.bytesToHexStringFormat(dataLayerDestinationMask) + + ", dataLayerVirtualLanMask=" + dataLayerVirtualLanMask + + ", dataLayerVirtualLanPriorityCodePointMask=" + + dataLayerVirtualLanPriorityCodePointMask + + ", dataLayerTypeMask=" + dataLayerTypeMask + + ", networkTypeOfServiceMask=" + networkTypeOfServiceMask + + ", networkProtocolMask=" + networkProtocolMask + + ", networkSourceMask=" + networkSourceMask + + ", networkDestinationMask=" + networkDestinationMask + + ", transportSourceMask=" + transportSourceMask + + ", transportDestinationMask=" + transportDestinationMask + + ", srcIPv6SubnetMaskbits=" + srcIPv6SubnetMaskbits + + ", dstIPv6SubnetMaskbits=" + dstIPv6SubnetMaskbits + + ", inputPortState=" + inputPortState + ", dlSourceState=" + + dlSourceState + ", dlDestState=" + dlDestState + + ", dlVlanState=" + dlVlanState + ", ethTypeState=" + + ethTypeState + ", nwTosState=" + nwTosState + + ", nwProtoState=" + nwProtoState + ", nwSrcState=" + + nwSrcState + ", nwDstState=" + nwDstState + ", tpSrcState=" + + tpSrcState + ", tpDstState=" + tpDstState + ", match_len=" + + match_len + ", pad_size=" + pad_size + "]"; } /** diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsRequest.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsRequest.java index c96419ef11..1644b1147b 100644 --- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsRequest.java +++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsRequest.java @@ -11,7 +11,6 @@ package org.opendaylight.controller.protocol_plugin.openflow.vendorextension.v6e import java.nio.ByteBuffer; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.openflow.protocol.statistics.OFVendorStatistics; @@ -150,7 +149,8 @@ public class V6StatsRequest extends OFVendorStatistics { @Override public String toString() { - return "V6StatsRequest[" + ReflectionToStringBuilder.toString(this) + return "V6StatsRequest [msgsubtype=" + msgsubtype + ", outPort=" + + outPort + ", match_len=" + match_len + ", tableId=" + tableId + "]"; } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java index d5fbdbc743..edb3537c12 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/core/MacAddress.java @@ -15,8 +15,7 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; - +import org.opendaylight.controller.sal.utils.HexEncode; /** * The class contains MAC address property. */ @@ -92,6 +91,7 @@ public class MacAddress extends Property implements Cloneable { @Override public String toString() { - return "MacAddress[" + ReflectionToStringBuilder.toString(this) + "]"; + return "MacAddress [address=" + + HexEncode.bytesToHexStringFormat(address) + "]"; } } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/DataLinkAddress.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/DataLinkAddress.java index 0c14517b19..96a992b3c3 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/DataLinkAddress.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/DataLinkAddress.java @@ -14,8 +14,6 @@ import java.io.Serializable; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; - /** * @file DataLinkAddress.java * @@ -94,7 +92,6 @@ abstract public class DataLinkAddress implements Serializable { @Override public String toString() { - return "DataLinkAddress[" + ReflectionToStringBuilder.toString(this) - + "]"; + return "DataLinkAddress [name=" + name + "]"; } } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/EthernetAddress.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/EthernetAddress.java index 2afaea8f42..6cd14eadce 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/EthernetAddress.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/address/EthernetAddress.java @@ -17,7 +17,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.opendaylight.controller.sal.core.ConstructionException; import org.opendaylight.controller.sal.utils.HexEncode; @@ -117,7 +116,7 @@ public class EthernetAddress extends DataLinkAddress { @Override public String toString() { - return "EthernetAddress[" + ReflectionToStringBuilder.toString(this) + return "EthernetAddress [macAddress=" + HexEncode.bytesToHexStringFormat(macAddress) + "]"; } diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/topology/TopoEdgeUpdate.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/topology/TopoEdgeUpdate.java index fff46eafaf..58bf350c40 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/topology/TopoEdgeUpdate.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/topology/TopoEdgeUpdate.java @@ -10,7 +10,6 @@ package org.opendaylight.controller.sal.topology; import java.util.Set; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.opendaylight.controller.sal.core.Edge; import org.opendaylight.controller.sal.core.Property; import org.opendaylight.controller.sal.core.UpdateType; @@ -54,8 +53,8 @@ public class TopoEdgeUpdate { @Override public String toString() { - return "TopoEdgeUpdate[" + ReflectionToStringBuilder.toString(this) - + "]"; + return "TopoEdgeUpdate [edge=" + edge + ", props=" + props + ", type=" + + type + "]"; } @Override diff --git a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Switch.java b/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Switch.java index eae01a6487..a665096e8b 100644 --- a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Switch.java +++ b/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/Switch.java @@ -16,9 +16,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.opendaylight.controller.sal.core.Node; import org.opendaylight.controller.sal.core.NodeConnector; +import org.opendaylight.controller.sal.utils.HexEncode; /** * The class describes switch related information including L2 address, ports, @@ -164,6 +164,8 @@ public class Switch implements Serializable { @Override public String toString() { - return "Switch[" + ReflectionToStringBuilder.toString(this) + "]"; + return "Switch [dataLayerAddress=" + HexEncode.bytesToHexStringFormat(dataLayerAddress) + + ", nodeConnectors=" + nodeConnectors + ", spanPorts=" + + spanPorts + ", node=" + node + "]"; } } -- 2.36.6