Minor fixes
- Format string fix
- FlowRuleEventTest: minor bugfix
- HexString: accept null
- byte[] toString() format change
Change-Id: I9db419cfc211670cc2abd796a21396ba960e23a9
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/VersionedValue.java b/core/api/src/main/java/org/onlab/onos/store/service/VersionedValue.java
index ae6969c..c3a4fac 100644
--- a/core/api/src/main/java/org/onlab/onos/store/service/VersionedValue.java
+++ b/core/api/src/main/java/org/onlab/onos/store/service/VersionedValue.java
@@ -1,5 +1,7 @@
package org.onlab.onos.store.service;
+import static org.onlab.util.HexString.toHexString;
+
import java.util.Arrays;
import com.google.common.base.MoreObjects;
@@ -64,7 +66,7 @@
public String toString() {
return MoreObjects.toStringHelper(getClass())
.add("version", version)
- .add("value", Arrays.toString(value))
+ .add("value", toHexString(value))
.toString();
}
}
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/WriteRequest.java b/core/api/src/main/java/org/onlab/onos/store/service/WriteRequest.java
index 5274c19..3234bea 100644
--- a/core/api/src/main/java/org/onlab/onos/store/service/WriteRequest.java
+++ b/core/api/src/main/java/org/onlab/onos/store/service/WriteRequest.java
@@ -3,6 +3,7 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.onlab.onos.store.service.WriteRequest.Type.*;
+import static org.onlab.util.HexString.toHexString;
import java.util.Objects;
@@ -189,9 +190,9 @@
.add("type", type)
.add("tableName", tableName)
.add("key", key)
- .add("newValue", newValue)
+ .add("newValue", toHexString(newValue))
.add("previousVersion", previousVersion)
- .add("oldValue", oldValue)
+ .add("oldValue", toHexString(oldValue))
.toString();
}