commit 53a285d5ee18d2494686f0d3994162deade8049a
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Oct 06 23:58:01 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Tue Oct 07 09:32:19 2014 -0700
tree 9725452f96ad846abc470429380afdb8e757edb9
parent ca8f670643795795242998a8596bde703c7c2905

use encode/decode instead of serialize/deserialize

Change-Id: I273bb86d32cb763e1eb8bbbe4efa7a8dab541c51

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

diff --git a/core/store/hz/common/src/main/java/org/onlab/onos/store/common/AbstractHazelcastStore.java b/core/store/hz/common/src/main/java/org/onlab/onos/store/common/AbstractHazelcastStore.java
index 0302105..29af33a 100644
--- a/core/store/hz/common/src/main/java/org/onlab/onos/store/common/AbstractHazelcastStore.java
+++ b/core/store/hz/common/src/main/java/org/onlab/onos/store/common/AbstractHazelcastStore.java
@@ -50,7 +50,7 @@
      * @return serialized object
      */
     protected byte[] serialize(Object obj) {
-        return kryoSerializationService.serialize(obj);
+        return kryoSerializationService.encode(obj);
     }
 
     /**
@@ -61,7 +61,7 @@
      * @return deserialized object
      */
     protected <T> T deserialize(byte[] bytes) {
-        return kryoSerializationService.deserialize(bytes);
+        return kryoSerializationService.decode(bytes);
     }
 
 

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

diff --git a/core/store/hz/common/src/main/java/org/onlab/onos/store/common/OptionalCacheLoader.java b/core/store/hz/common/src/main/java/org/onlab/onos/store/common/OptionalCacheLoader.java
index f96fdd8..2629e2d 100644
--- a/core/store/hz/common/src/main/java/org/onlab/onos/store/common/OptionalCacheLoader.java
+++ b/core/store/hz/common/src/main/java/org/onlab/onos/store/common/OptionalCacheLoader.java
@@ -34,12 +34,12 @@
 
     @Override
     public Optional<V> load(K key) throws Exception {
-        byte[] keyBytes = kryoSerializationService.serialize(key);
+        byte[] keyBytes = kryoSerializationService.encode(key);
         byte[] valBytes = rawMap.get(keyBytes);
         if (valBytes == null) {
             return Optional.absent();
         }
-        V dev = kryoSerializationService.deserialize(valBytes);
+        V dev = kryoSerializationService.decode(valBytes);
         return Optional.of(dev);
     }
 }