Slice out byte[] printer

Change-Id: I095575df5f03057c386be77328897be59c96eaf9

@@ -2,6 +2,8 @@ package org.onlab.onos.store.service;
 
 
 import java.util.Arrays;
 import java.util.Arrays;
 
 
+import org.onlab.util.ByteArraySizeHashPrinter;
+
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects;
 
 
 /**
 /**
@@ -64,7 +66,7 @@ public class VersionedValue {
     public String toString() {
     public String toString() {
         return MoreObjects.toStringHelper(getClass())
         return MoreObjects.toStringHelper(getClass())
                 .add("version", version)
                 .add("version", version)
-                .add("value", value != null ? "[" + value.length + " bytes]" : value)
+                .add("value", ByteArraySizeHashPrinter.orNull(value))
                 .toString();
                 .toString();
     }
     }
 }
 }

@@ -6,6 +6,8 @@ import static org.onlab.onos.store.service.WriteRequest.Type.*;
 
 
 import java.util.Objects;
 import java.util.Objects;
 
 
+import org.onlab.util.ByteArraySizeHashPrinter;
+
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects;
 
 
 /**
 /**
@@ -185,13 +187,13 @@ public class WriteRequest {
 
 
     @Override
     @Override
     public String toString() {
     public String toString() {
-        return MoreObjects.toStringHelper(getClass())
+         return MoreObjects.toStringHelper(getClass())
                 .add("type", type)
                 .add("type", type)
                 .add("tableName", tableName)
                 .add("tableName", tableName)
                 .add("key", key)
                 .add("key", key)
-                .add("newValue", newValue != null ? "[" + newValue.length + " bytes]" : newValue)
+                .add("newValue", ByteArraySizeHashPrinter.orNull(newValue))
                 .add("previousVersion", previousVersion)
                 .add("previousVersion", previousVersion)
-                .add("oldValue", oldValue != null ? "[" + oldValue.length + " bytes]" : oldValue)
+                .add("oldValue", ByteArraySizeHashPrinter.orNull(oldValue))
                 .toString();
                 .toString();
     }
     }
 
 

+/*
+ * Copyright 2014 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.onlab.util;
+
+import java.util.Arrays;
+
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
+
+/**
+ * Helper to print byte[] length and hashCode.
+ */
+public final class ByteArraySizeHashPrinter {
+
+    private final byte[] bytes;
+
+    /**
+     * Returns ByteArraySizeHashPrinter wrapping given byte[].
+     *
+     * @param bytes bytes to wrap around
+     * @return ByteArraySizeHashPrinter
+     */
+    public static ByteArraySizeHashPrinter of(byte[] bytes) {
+        return new ByteArraySizeHashPrinter(bytes);
+    }
+
+    /**
+     * Returns ByteArraySizeHashPrinter wrapping given byte[].
+     *
+     * @param bytes bytes to wrap around
+     * @return null if {@code bytes == null}, ByteArraySizeHashPrinter otherwise
+     */
+    public static ByteArraySizeHashPrinter orNull(byte[] bytes) {
+        if (bytes == null) {
+            return null;
+        }
+        return new ByteArraySizeHashPrinter(bytes);
+    }
+
+    public ByteArraySizeHashPrinter(byte[] bytes) {
+        this.bytes = bytes;
+    }
+
+    @Override
+    public String toString() {
+        ToStringHelper helper = MoreObjects.toStringHelper("byte[]");
+        if (bytes != null) {
+            helper.add("length", bytes.length)
+                  .add("hash", Arrays.hashCode(bytes));
+        } else {
+            helper.addValue(bytes);
+        }
+        return helper.toString();
+    }
+}

+/*
+ * Copyright 2014 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.onlab.util;
+
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+/**
+ * Test cases for byte[] pretty printer.
+ */
+public class ByteArraySizeHashPrinterTest {
+
+    /**
+     * Test method for {@link org.onlab.util.ByteArraySizeHashPrinter#toString()}.
+     */
+    @Test
+    public void testToStringNull() {
+        final byte[] none = null;
+
+        assertEquals("byte[]{null}", String.valueOf(ByteArraySizeHashPrinter.of(none)));
+        assertNull(ByteArraySizeHashPrinter.orNull(none));
+    }
+
+    /**
+     * Test method for {@link org.onlab.util.ByteArraySizeHashPrinter#toString()}.
+     */
+    @Test
+    public void testToString() {
+        final byte[] some = new byte[] {2, 5, 0, 1 };
+        final String expected = "byte[]{length=" + some.length + ", hash=" + Arrays.hashCode(some) + "}";
+
+        assertEquals(expected, String.valueOf(ByteArraySizeHashPrinter.of(some)));
+        assertNotNull(ByteArraySizeHashPrinter.orNull(some));
+    }
+
+}