Rename KryoPool -> KryoNamespace
Change-Id: Ife1c311b40eaab133bb3b8dd3314b98c60b4411d
diff --git a/utils/misc/src/main/java/org/onlab/util/KryoPool.java b/utils/misc/src/main/java/org/onlab/util/KryoNamespace.java
similarity index 92%
rename from utils/misc/src/main/java/org/onlab/util/KryoPool.java
rename to utils/misc/src/main/java/org/onlab/util/KryoNamespace.java
index 3fae0c5..9c5f790 100644
--- a/utils/misc/src/main/java/org/onlab/util/KryoPool.java
+++ b/utils/misc/src/main/java/org/onlab/util/KryoNamespace.java
@@ -20,7 +20,7 @@
* Pool of Kryo instances, with classes pre-registered.
*/
//@ThreadSafe
-public final class KryoPool {
+public final class KryoNamespace {
/**
* Default buffer size used for serialization.
@@ -34,7 +34,7 @@
private final boolean registrationRequired;
/**
- * KryoPool builder.
+ * KryoNamespace builder.
*/
//@NotThreadSafe
public static final class Builder {
@@ -42,12 +42,12 @@
private final List<Pair<Class<?>, Serializer<?>>> types = new ArrayList<>();
/**
- * Builds a {@link KryoPool} instance.
+ * Builds a {@link KryoNamespace} instance.
*
- * @return KryoPool
+ * @return KryoNamespace
*/
- public KryoPool build() {
- return new KryoPool(types);
+ public KryoNamespace build() {
+ return new KryoNamespace(types);
}
/**
@@ -76,19 +76,19 @@
}
/**
- * Registers all the class registered to given KryoPool.
+ * Registers all the class registered to given KryoNamespace.
*
- * @param pool KryoPool
+ * @param pool KryoNamespace
* @return this
*/
- public Builder register(final KryoPool pool) {
+ public Builder register(final KryoNamespace pool) {
types.addAll(pool.registeredTypes);
return this;
}
}
/**
- * Creates a new {@link KryoPool} builder.
+ * Creates a new {@link KryoNamespace} builder.
*
* @return builder
*/
@@ -101,7 +101,7 @@
*
* @param registerdTypes types to register
*/
- private KryoPool(final List<Pair<Class<?>, Serializer<?>>> registerdTypes) {
+ private KryoNamespace(final List<Pair<Class<?>, Serializer<?>>> registerdTypes) {
this.registeredTypes = ImmutableList.copyOf(registerdTypes);
// always true for now
this.registrationRequired = true;
@@ -113,7 +113,7 @@
* @param instances to add to the pool
* @return this
*/
- public KryoPool populate(int instances) {
+ public KryoNamespace populate(int instances) {
List<Kryo> kryos = new ArrayList<>(instances);
for (int i = 0; i < instances; ++i) {
kryos.add(newKryoInstance());
diff --git a/utils/netty/src/main/java/org/onlab/netty/KryoSerializer.java b/utils/netty/src/main/java/org/onlab/netty/KryoSerializer.java
index b8efb51..bc95fc6 100644
--- a/utils/netty/src/main/java/org/onlab/netty/KryoSerializer.java
+++ b/utils/netty/src/main/java/org/onlab/netty/KryoSerializer.java
@@ -1,6 +1,6 @@
package org.onlab.netty;
-import org.onlab.util.KryoPool;
+import org.onlab.util.KryoNamespace;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -12,7 +12,7 @@
*/
public class KryoSerializer {
- private KryoPool serializerPool;
+ private KryoNamespace serializerPool;
public KryoSerializer() {
setupKryoPool();
@@ -23,7 +23,7 @@
*/
protected void setupKryoPool() {
// FIXME Slice out types used in common to separate pool/namespace.
- serializerPool = KryoPool.newBuilder()
+ serializerPool = KryoNamespace.newBuilder()
.register(ArrayList.class,
HashMap.class,
ArrayList.class,