mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-22 04:40:59 +02:00
Code Issues Projects Releases Wiki Activity

use encode/decode instead of serialize/deserialize

Browse Source 
Change-Id: I273bb86d32cb763e1eb8bbbe4efa7a8dab541c51
This commit is contained in:
Yuta HIGUCHI 2014-10-06 23:58:01 -07:00
parent ca8f670643
commit 53a285d5ee
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/SerializationService.java vendored
View File

@ -1,7 +1,7 @@
package org.onlab.onos.store.cluster.messaging; package org.onlab.onos.store.cluster.messaging;
/** /**
* Service for encoding & decoding intra-cluster messages. * Service for encoding & decoding intra-cluster message payload.
*/ */
public interface SerializationService { public interface SerializationService {
@ -11,7 +11,7 @@ public interface SerializationService {
* @param buffer byte buffer with message(s) * @param buffer byte buffer with message(s)
* @return parsed message * @return parsed message
*/ */
Object decode(byte[] data); <T> T decode(byte[] data);
/** /**
* Encodes the specified message into the given byte buffer. * Encodes the specified message into the given byte buffer.

2
core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/MessageSerializer.java vendored
View File

@ -52,7 +52,7 @@ public class MessageSerializer implements SerializationService {
@Override @Override
public Object decode(byte[] data) { public <T> T decode(byte[] data) {
return serializerPool.deserialize(data); return serializerPool.deserialize(data);
} }

4
core/store/hz/common/src/main/java/org/onlab/onos/store/common/AbstractHazelcastStore.java
View File

@ -50,7 +50,7 @@ public abstract class AbstractHazelcastStore<E extends Event, D extends StoreDel
* @return serialized object * @return serialized object
*/ */
protected byte[] serialize(Object obj) { protected byte[] serialize(Object obj) {
return kryoSerializationService.serialize(obj); return kryoSerializationService.encode(obj);
} }
/** /**
@ -61,7 +61,7 @@ public abstract class AbstractHazelcastStore<E extends Event, D extends StoreDel
* @return deserialized object * @return deserialized object
*/ */
protected <T> T deserialize(byte[] bytes) { protected <T> T deserialize(byte[] bytes) {
return kryoSerializationService.deserialize(bytes); return kryoSerializationService.decode(bytes);
} }

4
core/store/hz/common/src/main/java/org/onlab/onos/store/common/OptionalCacheLoader.java
View File

@ -34,12 +34,12 @@ public final class OptionalCacheLoader<K, V> extends
@Override @Override
public Optional<V> load(K key) throws Exception { public Optional<V> load(K key) throws Exception {
byte[] keyBytes = kryoSerializationService.serialize(key); byte[] keyBytes = kryoSerializationService.encode(key);
byte[] valBytes = rawMap.get(keyBytes); byte[] valBytes = rawMap.get(keyBytes);
if (valBytes == null) { if (valBytes == null) {
return Optional.absent(); return Optional.absent();
} }
V dev = kryoSerializationService.deserialize(valBytes); V dev = kryoSerializationService.decode(valBytes);
return Optional.of(dev); return Optional.of(dev);
} }
} }

8
core/store/serializers/src/main/java/org/onlab/onos/store/serializers/KryoSerializationManager.java
View File

@ -43,12 +43,12 @@ public class KryoSerializationManager implements KryoSerializationService {
} }
@Override @Override
public byte[] serialize(final Object obj) { public byte[] encode(final Object obj) {
return serializerPool.serialize(obj); return serializerPool.serialize(obj);
} }
@Override @Override
public <T> T deserialize(final byte[] bytes) { public <T> T decode(final byte[] bytes) {
if (bytes == null) { if (bytes == null) {
return null; return null;
} }
@ -56,12 +56,12 @@ public class KryoSerializationManager implements KryoSerializationService {
} }
@Override @Override
public void serialize(Object obj, ByteBuffer buffer) { public void encode(Object obj, ByteBuffer buffer) {
serializerPool.serialize(obj, buffer); serializerPool.serialize(obj, buffer);
} }
@Override @Override
public <T> T deserialize(ByteBuffer buffer) { public <T> T decode(ByteBuffer buffer) {
return serializerPool.deserialize(buffer); return serializerPool.deserialize(buffer);
} }

8
core/store/serializers/src/main/java/org/onlab/onos/store/serializers/KryoSerializationService.java
View File

@ -15,7 +15,7 @@ public interface KryoSerializationService {
* @param obj object to be serialized * @param obj object to be serialized
* @return serialized bytes * @return serialized bytes
*/ */
public byte[] serialize(final Object obj); public byte[] encode(final Object obj);
/** /**
* Serializes the specified object into bytes using one of the * Serializes the specified object into bytes using one of the
@ -24,7 +24,7 @@ public interface KryoSerializationService {
* @param obj object to be serialized * @param obj object to be serialized
* @param buffer to write serialized bytes * @param buffer to write serialized bytes
*/ */
public void serialize(final Object obj, ByteBuffer buffer); public void encode(final Object obj, ByteBuffer buffer);
/** /**
* Deserializes the specified bytes into an object using one of the * Deserializes the specified bytes into an object using one of the
@ -33,7 +33,7 @@ public interface KryoSerializationService {
* @param bytes bytes to be deserialized * @param bytes bytes to be deserialized
* @return deserialized object * @return deserialized object
*/ */
public <T> T deserialize(final byte[] bytes); public <T> T decode(final byte[] bytes);
/** /**
* Deserializes the specified bytes into an object using one of the * Deserializes the specified bytes into an object using one of the
@ -42,5 +42,5 @@ public interface KryoSerializationService {
* @param buffer bytes to be deserialized * @param buffer bytes to be deserialized
* @return deserialized object * @return deserialized object
*/ */
public <T> T deserialize(final ByteBuffer buffer); public <T> T decode(final ByteBuffer buffer);
} }