From 1c1158cceba5bffdaa550bb0e729a08fe3e8e5e2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 3 Apr 2023 16:33:56 +0200 Subject: [PATCH] Remove FollowerIdentifier.Proxy This proxy has been deprecated, remove it. JIRA: CONTROLLER-2081 Change-Id: I1a80305a87c692ff1c39f02a7113d4c29847dc22 Signed-off-by: Robert Varga --- .../raft/behaviors/FollowerIdentifier.java | 35 +------------------ 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/FollowerIdentifier.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/FollowerIdentifier.java index bdf7a3f9d2..2586f2091e 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/FollowerIdentifier.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/FollowerIdentifier.java @@ -7,10 +7,6 @@ */ package org.opendaylight.controller.cluster.raft.behaviors; -import java.io.Externalizable; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.opendaylight.yangtools.util.AbstractStringIdentifier; /** @@ -18,7 +14,7 @@ import org.opendaylight.yangtools.util.AbstractStringIdentifier; * * @author Thomas Pantelis */ -class FollowerIdentifier extends AbstractStringIdentifier { +final class FollowerIdentifier extends AbstractStringIdentifier { @java.io.Serial private static final long serialVersionUID = 1L; @@ -30,33 +26,4 @@ class FollowerIdentifier extends AbstractStringIdentifier { private Object writeReplace() { return new FI(getValue()); } - - @Deprecated(since = "7.0.0", forRemoval = true) - private static class Proxy implements Externalizable { - @java.io.Serial - private static final long serialVersionUID = 1L; - - private FollowerIdentifier identifier; - - // 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() { - } - - @Override - public void writeExternal(final ObjectOutput out) { - throw new UnsupportedOperationException(); - } - - @Override - public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { - identifier = new FollowerIdentifier((String) in.readObject()); - } - - @java.io.Serial - private Object readResolve() { - return identifier; - } - } } -- 2.36.6