From ebb756e983e44035641b0e890ca6baa96e34c6dd Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 3 Apr 2023 16:19:26 +0200 Subject: [PATCH] Remove EmptyExternalizableProxy EmptyExternalizableProxy is a rather inefficient way of doing things, remove it along with its (unused) users. JIRA: CONTROLLER-2079 Change-Id: I87179e1e8b53547711b4d0c8ceb4607f341c997d Signed-off-by: Robert Varga --- .../messages/EmptyExternalizableProxy.java | 43 ------------------- .../raft/base/messages/TimeoutNow.java | 14 +----- .../raft/client/messages/Shutdown.java | 15 +------ 3 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/EmptyExternalizableProxy.java diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/EmptyExternalizableProxy.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/EmptyExternalizableProxy.java deleted file mode 100644 index 96c25d56d3..0000000000 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/EmptyExternalizableProxy.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2017 Inocybe Technologies and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.raft.base.messages; - -import static java.util.Objects.requireNonNull; - -import java.io.Externalizable; -import java.io.ObjectInput; -import java.io.ObjectOutput; - -/** - * Abstract base that implements Externalizable with no-op methods that is intended for classes that use the - * externalizable proxy pattern but have no data to serialize and read-resolve to a static instance. - * - * @author Thomas Pantelis - */ -@Deprecated(since = "7.0.0", forRemoval = true) -public abstract class EmptyExternalizableProxy implements Externalizable { - private static final long serialVersionUID = 1L; - - private final Object readResolveTo; - - protected EmptyExternalizableProxy(final Object readResolveTo) { - this.readResolveTo = requireNonNull(readResolveTo); - } - - @Override - public void writeExternal(final ObjectOutput out) { - } - - @Override - public void readExternal(final ObjectInput in) { - } - - protected Object readResolve() { - return readResolveTo; - } -} diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/TimeoutNow.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/TimeoutNow.java index be3b0b5ffd..2b76844819 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/TimeoutNow.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/base/messages/TimeoutNow.java @@ -26,20 +26,8 @@ public final class TimeoutNow implements Serializable, ControlMessage { } @java.io.Serial + @SuppressWarnings("static-method") private Object readResolve() { return INSTANCE; } - - @Deprecated(since = "7.0.0", forRemoval = true) - private static class Proxy extends EmptyExternalizableProxy { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant which really doesn't make sense since it clearly isn't - // redundant. It is explicitly needed for Java serialization to be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public Proxy() { - super(INSTANCE); - } - } } diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/client/messages/Shutdown.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/client/messages/Shutdown.java index 2f2ff47934..7fba245bf2 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/client/messages/Shutdown.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/client/messages/Shutdown.java @@ -9,7 +9,6 @@ package org.opendaylight.controller.cluster.raft.client.messages; import akka.dispatch.ControlMessage; import java.io.Serializable; -import org.opendaylight.controller.cluster.raft.base.messages.EmptyExternalizableProxy; /** * Message sent to a raft actor to shutdown gracefully. If it's the leader it will transfer leadership to a @@ -29,20 +28,8 @@ public final class Shutdown implements Serializable, ControlMessage { } @java.io.Serial + @SuppressWarnings("static-method") private Object readResolve() { return INSTANCE; } - - @Deprecated(since = "7.0.0", forRemoval = true) - private static class Proxy extends EmptyExternalizableProxy { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant which really doesn't make sense since it clearly isn't - // redundant. It is explicitly needed for Java serialization to be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public Proxy() { - super(INSTANCE); - } - } } -- 2.36.6