Remove deprecated KryoSerializer class
Change-Id: Ieb643b1b4f30f71ec8cfc763d3d45a7f6b4275c6
diff --git a/apps/test/messaging-perf/src/main/java/org/onosproject/messagingperf/MessagingPerfApp.java b/apps/test/messaging-perf/src/main/java/org/onosproject/messagingperf/MessagingPerfApp.java
index 03d4f63..39c5170 100644
--- a/apps/test/messaging-perf/src/main/java/org/onosproject/messagingperf/MessagingPerfApp.java
+++ b/apps/test/messaging-perf/src/main/java/org/onosproject/messagingperf/MessagingPerfApp.java
@@ -15,12 +15,6 @@
*/
package org.onosproject.messagingperf;
-import static com.google.common.base.Strings.isNullOrEmpty;
-import static org.apache.felix.scr.annotations.ReferenceCardinality.MANDATORY_UNARY;
-import static org.onlab.util.Tools.get;
-import static org.onlab.util.Tools.groupedThreads;
-import static org.slf4j.LoggerFactory.getLogger;
-
import java.util.Dictionary;
import java.util.List;
import java.util.Objects;
@@ -52,7 +46,7 @@
import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
import org.onosproject.store.cluster.messaging.MessageSubject;
import org.onosproject.store.serializers.KryoNamespaces;
-import org.onosproject.store.serializers.KryoSerializer;
+import org.onosproject.store.service.Serializer;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
@@ -62,6 +56,12 @@
import com.google.common.collect.Sets;
import com.google.common.util.concurrent.MoreExecutors;
+import static com.google.common.base.Strings.isNullOrEmpty;
+import static org.apache.felix.scr.annotations.ReferenceCardinality.MANDATORY_UNARY;
+import static org.onlab.util.Tools.get;
+import static org.onlab.util.Tools.groupedThreads;
+import static org.slf4j.LoggerFactory.getLogger;
+
/**
* Application for measuring cluster messaging performance.
*/
@@ -124,16 +124,13 @@
private AtomicInteger attempted = new AtomicInteger(0);
private AtomicInteger completed = new AtomicInteger(0);
- protected static final KryoSerializer SERIALIZER = new KryoSerializer() {
- @Override
- protected void setupKryoPool() {
- serializerPool = KryoNamespace.newBuilder()
+ private static final Serializer SERIALIZER = Serializer
+ .using(
+ KryoNamespace.newBuilder()
.register(KryoNamespaces.BASIC)
.register(KryoNamespaces.MISC)
.register(Data.class)
- .build("MessagingPerfApp");
- }
- };
+ .build("MessagingPerfApp"));
private final Data data = new Data().withStringField("test")
.withListField(Lists.newArrayList("1", "2", "3"))
diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoSerializer.java
deleted file mode 100644
index 0837a91..0000000
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoSerializer.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2014-present Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.store.serializers;
-
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-
-import org.onlab.util.KryoNamespace;
-
-import com.google.common.base.MoreObjects;
-
-/**
- * StoreSerializer implementation using Kryo.
- *
- * @deprecated in Goldeneye (1.6.0)
- */
-@Deprecated
-public class KryoSerializer implements StoreSerializer {
-
- protected KryoNamespace serializerPool;
-
- public KryoSerializer() {
- setupKryoPool();
- }
-
- /**
- * Sets up the common serializers pool.
- */
- protected void setupKryoPool() {
- serializerPool = KryoNamespace.newBuilder()
- .register(KryoNamespaces.API)
- .nextId(KryoNamespaces.BEGIN_USER_CUSTOM_ID)
- .build();
- }
-
- @Override
- public byte[] encode(final Object obj) {
- return serializerPool.serialize(obj);
- }
-
- @Override
- public <T> T decode(final byte[] bytes) {
- if (bytes == null) {
- return null;
- }
- return serializerPool.deserialize(bytes);
- }
-
- @Override
- public void encode(Object obj, ByteBuffer buffer) {
- serializerPool.serialize(obj, buffer);
- }
-
- @Override
- public <T> T decode(ByteBuffer buffer) {
- return serializerPool.deserialize(buffer);
- }
-
- @Override
- public void encode(Object obj, OutputStream stream) {
- serializerPool.serialize(obj, stream);
- }
-
- @Override
- public <T> T decode(InputStream stream) {
- return serializerPool.deserialize(stream);
- }
-
- @Override
- public <T> T copy(T object) {
- return decode(encode(object));
- }
-
- @Override
- public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("serializerPool", serializerPool)
- .toString();
- }
-}