Add IdentifiedDataSerializable to hazelcast.xml config.
- There was a bug, in #718, where Serialization configuration required for datastore mode
is missing in Hazelcast instance created for Event.
This patch adds the required configuration to hazelcast.xml templates.
- WARNING: User need to regenerate hazelcast.xml after this patch.
Change-Id: I6f07810930457336673f7c511540e8ce1d0af746
diff --git a/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java b/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java
index bb74422..8c34cac 100644
--- a/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java
+++ b/src/main/java/net/onrc/onos/core/datastore/hazelcast/HZClient.java
@@ -56,6 +56,11 @@
private static final HZClient THE_INSTANCE = new HZClient();
+ /**
+ * Get DataStoreClient implemented on Hazelcast.
+ *
+ * @return HZClient
+ */
public static HZClient getClient() {
return THE_INSTANCE;
}
@@ -170,9 +175,12 @@
/**
* Register serializer for VersionedValue class used to imitate value version.
*
- * @param config
+ * @param config SerializationConfig to add VersionedValueSerializableFactory.
*/
private static void registerSerializer(final SerializationConfig config) {
+ // TODO remove this function at some point.
+ // This method is no longer required, if equibalent to the following
+ // is defined in hazelcast.xml
config.addDataSerializableFactoryClass(
VersionedValueSerializableFactory.FACTORY_ID,
VersionedValueSerializableFactory.class);
diff --git a/src/main/java/net/onrc/onos/core/datastore/hazelcast/VersionedValueSerializableFactory.java b/src/main/java/net/onrc/onos/core/datastore/hazelcast/VersionedValueSerializableFactory.java
index 75bd568..7177695 100644
--- a/src/main/java/net/onrc/onos/core/datastore/hazelcast/VersionedValueSerializableFactory.java
+++ b/src/main/java/net/onrc/onos/core/datastore/hazelcast/VersionedValueSerializableFactory.java
@@ -3,11 +3,20 @@
import com.hazelcast.nio.serialization.DataSerializableFactory;
import com.hazelcast.nio.serialization.IdentifiedDataSerializable;
+/**
+ * IdentifiedDataSerializableFactory for HZTable.VersionedValue class.
+ */
public class VersionedValueSerializableFactory implements
DataSerializableFactory {
// revisit these magic numbers
+ /**
+ * IdentifiedDataSerializable Factory ID.
+ */
public static final int FACTORY_ID = 1;
+ /**
+ * IdentifiedDataSerializable type ID for HZTable.VersionedValue class.
+ */
public static final int VERSIONED_VALUE_ID = 1;
@Override
@@ -20,5 +29,4 @@
return null;
}
}
-
}