diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageDecoder.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageDecoder.java index 8c24a01df3..43bc7cbf4c 100644 --- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageDecoder.java +++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageDecoder.java @@ -23,7 +23,6 @@ import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.frame.FrameDecoder; import org.onosproject.bgpio.protocol.BgpMessage; -import org.onlab.util.HexDump; import org.onosproject.bgpio.protocol.BgpFactories; import org.onosproject.bgpio.protocol.BgpMessageReader; import org.onosproject.bgpio.types.BgpHeader; diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageEncoder.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageEncoder.java index 9606e69ed6..7f520e4a6b 100644 --- a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageEncoder.java +++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/BgpMessageEncoder.java @@ -23,8 +23,6 @@ import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.oneone.OneToOneEncoder; import org.onosproject.bgpio.protocol.BgpMessage; -import org.onlab.util.HexDump; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/HexDump.java b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/HexDump.java new file mode 100644 index 0000000000..b3e2ccfb07 --- /dev/null +++ b/protocols/bgp/ctl/src/main/java/org/onosproject/bgp/controller/impl/HexDump.java @@ -0,0 +1,54 @@ +/* + * Copyright 2015-present Open Networking Laboratory + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.onosproject.bgp.controller.impl; + +import org.jboss.netty.buffer.ChannelBuffer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * HexDump class an utility to dump buffer in hex format. + */ +public final class HexDump { + protected static final Logger log = LoggerFactory.getLogger(HexDump.class); + + private HexDump() { + } + + /** + * Dump the buffer content in hex format. + * + * @param buff buffer content to dump in hex format + */ + public static void dump(ChannelBuffer buff) { + buff.markReaderIndex(); + try { + do { + StringBuilder sb = new StringBuilder(); + for (int k = 0; (k < 16) && (buff.readableBytes() != 0); ++k) { + if (0 == k % 4) { + sb.append(String.format(" ")); // blank after 4 bytes + } + sb.append(String.format("%02X ", buff.readByte())); + } + log.debug(sb.toString()); + } while (buff.readableBytes() != 0); + } catch (Exception e) { + log.error("[HexDump] Invalid buffer: " + e.toString()); + } + buff.resetReaderIndex(); + } +} diff --git a/utils/misc/src/main/java/org/onlab/util/HexDump.java b/utils/misc/src/main/java/org/onlab/util/HexDump.java index 43857c2d98..02d68c7197 100644 --- a/utils/misc/src/main/java/org/onlab/util/HexDump.java +++ b/utils/misc/src/main/java/org/onlab/util/HexDump.java @@ -21,7 +21,10 @@ import org.slf4j.LoggerFactory; /** * HexDump class an utility to dump buffer in hex format. + * + * @deprecated in 1.11.0 */ +@Deprecated public final class HexDump { protected static final Logger log = LoggerFactory.getLogger(HexDump.class);