Added kryo serializer for ImmutableByteSequence
Serialization was failing when the inner ByteBuffer instance was a
HeapByteBuffer. Also, simplified ImmutableByteSequence.toString()
Change-Id: I4f75086a9b6536205fb43b78a0e4d2bfce9e8a5c
diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/ImmutableByteSequenceSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/ImmutableByteSequenceSerializer.java
new file mode 100644
index 0000000..4752734
--- /dev/null
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/ImmutableByteSequenceSerializer.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2016-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.store.serializers;
+
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.Serializer;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.Output;
+import org.onlab.util.ImmutableByteSequence;
+
+/**
+ * Kryo serializer for {@link ImmutableByteSequence}.
+ */
+public class ImmutableByteSequenceSerializer extends Serializer<ImmutableByteSequence> {
+
+ /**
+ * Creates a new {@link ImmutableByteSequence} serializer instance.
+ */
+ public ImmutableByteSequenceSerializer() {
+ // non-null, immutable.
+ super(false, true);
+ }
+
+ @Override
+ public void write(Kryo kryo, Output output, ImmutableByteSequence object) {
+ byte[] data = object.asArray();
+ output.writeInt(data.length);
+ output.write(data);
+ }
+
+ @Override
+ public ImmutableByteSequence read(Kryo kryo, Input input, Class<ImmutableByteSequence> type) {
+ int length = input.readInt();
+ byte[] data = new byte[length];
+ input.read(data);
+ return ImmutableByteSequence.copyFrom(data);
+ }
+}
diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
index 113ad3d..e51ee78 100644
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
@@ -537,7 +537,7 @@
)
.register(ClosedOpenRange.class)
.register(DiscreteResourceCodec.class)
- .register(ImmutableByteSequence.class)
+ .register(new ImmutableByteSequenceSerializer(), ImmutableByteSequence.class)
.build("API");
diff --git a/utils/misc/src/main/java/org/onlab/util/ImmutableByteSequence.java b/utils/misc/src/main/java/org/onlab/util/ImmutableByteSequence.java
index f5f9a59..284abac 100644
--- a/utils/misc/src/main/java/org/onlab/util/ImmutableByteSequence.java
+++ b/utils/misc/src/main/java/org/onlab/util/ImmutableByteSequence.java
@@ -16,7 +16,6 @@
package org.onlab.util;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.nio.ByteBuffer;
@@ -238,8 +237,6 @@
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
- .addValue(HexString.toHexString(asArray()))
- .toString();
+ return HexString.toHexString(value.array());
}
}
\ No newline at end of file