DeviceIdSerializer
Change-Id: Ic0f4474c88b8eabca76e382d737bddb7cb2d7112
diff --git a/core/store/src/main/java/org/onlab/onos/store/device/impl/DeviceIdSerializer.java b/core/store/src/main/java/org/onlab/onos/store/device/impl/DeviceIdSerializer.java
new file mode 100644
index 0000000..73d1d0b
--- /dev/null
+++ b/core/store/src/main/java/org/onlab/onos/store/device/impl/DeviceIdSerializer.java
@@ -0,0 +1,28 @@
+package org.onlab.onos.store.device.impl;
+
+import java.net.URI;
+
+import org.onlab.onos.net.DeviceId;
+
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.Serializer;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.Output;
+
+//TODO move to util, etc.
+/**
+* Kryo Serializer for {@link DeviceId}.
+*/
+public final class DeviceIdSerializer extends Serializer<DeviceId> {
+
+ @Override
+ public void write(Kryo kryo, Output output, DeviceId object) {
+ kryo.writeObject(output, object.uri());
+ }
+
+ @Override
+ public DeviceId read(Kryo kryo, Input input, Class<DeviceId> type) {
+ final URI uri = kryo.readObject(input, URI.class);
+ return DeviceId.deviceId(uri);
+ }
+}
diff --git a/core/store/src/main/java/org/onlab/onos/store/device/impl/DistributedDeviceStore.java b/core/store/src/main/java/org/onlab/onos/store/device/impl/DistributedDeviceStore.java
index fe03cda..270557e 100644
--- a/core/store/src/main/java/org/onlab/onos/store/device/impl/DistributedDeviceStore.java
+++ b/core/store/src/main/java/org/onlab/onos/store/device/impl/DistributedDeviceStore.java
@@ -44,10 +44,6 @@
import org.onlab.util.KryoPool;
import org.slf4j.Logger;
-import com.esotericsoftware.kryo.Kryo;
-import com.esotericsoftware.kryo.Serializer;
-import com.esotericsoftware.kryo.io.Input;
-import com.esotericsoftware.kryo.io.Output;
import com.google.common.base.Optional;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
@@ -444,20 +440,6 @@
return POOL.deserialize(bytes);
}
- public static final class DeviceIdSerializer extends Serializer<DeviceId> {
-
- @Override
- public void write(Kryo kryo, Output output, DeviceId object) {
- kryo.writeObject(output, object.uri());
- }
-
- @Override
- public DeviceId read(Kryo kryo, Input input, Class<DeviceId> type) {
- final URI uri = kryo.readObject(input, URI.class);
- return DeviceId.deviceId(uri);
- }
- }
-
/**
* An IMap EntryListener, which reflects each remote event to cache.
*
diff --git a/core/store/src/main/java/org/onlab/onos/store/package-info.java b/core/store/src/main/java/org/onlab/onos/store/package-info.java
index e0b6956..bea7fb0 100644
--- a/core/store/src/main/java/org/onlab/onos/store/package-info.java
+++ b/core/store/src/main/java/org/onlab/onos/store/package-info.java
@@ -2,4 +2,4 @@
* Common abstractions and facilities for implementing distributed store
* using Hazelcast.
*/
-package org.onlab.onos.store;
\ No newline at end of file
+package org.onlab.onos.store;