X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2Fbehaviors%2FAbstractLeader.java;h=9feea2f0f2ba32dc16afa594798bced8f88c6a5c;hb=435a1a7a0e44d79c4cb0f4ea2da09215b7c68f4f;hp=dc9cb23facac0aaab31b463105db136de7ea31a2;hpb=2d60632f7cf63712e8357a3cf3fc40d83366e5e6;p=controller.git diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java index dc9cb23fac..9feea2f0f2 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java @@ -15,6 +15,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.io.ByteSource; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.ObjectOutputStream; import java.util.Collection; @@ -34,7 +35,6 @@ import org.opendaylight.controller.cluster.messaging.SliceOptions; import org.opendaylight.controller.cluster.raft.ClientRequestTracker; import org.opendaylight.controller.cluster.raft.ClientRequestTrackerImpl; import org.opendaylight.controller.cluster.raft.FollowerLogInformation; -import org.opendaylight.controller.cluster.raft.FollowerLogInformationImpl; import org.opendaylight.controller.cluster.raft.PeerInfo; import org.opendaylight.controller.cluster.raft.RaftActorContext; import org.opendaylight.controller.cluster.raft.RaftState; @@ -116,7 +116,7 @@ public abstract class AbstractLeader extends AbstractRaftActorBehavior { trackers.addAll(initializeFromLeader.trackers); } else { for (PeerInfo peerInfo: context.getPeers()) { - FollowerLogInformation followerLogInformation = new FollowerLogInformationImpl(peerInfo, -1, context); + FollowerLogInformation followerLogInformation = new FollowerLogInformation(peerInfo, context); followerToLog.put(peerInfo.getId(), followerLogInformation); } } @@ -149,8 +149,8 @@ public abstract class AbstractLeader extends AbstractRaftActorBehavior { } public void addFollower(final String followerId) { - FollowerLogInformation followerLogInformation = new FollowerLogInformationImpl( - context.getPeerInfo(followerId), -1, context); + FollowerLogInformation followerLogInformation = new FollowerLogInformation(context.getPeerInfo(followerId), + context); followerToLog.put(followerId, followerLogInformation); if (heartbeatSchedule == null) { @@ -185,6 +185,8 @@ public abstract class AbstractLeader extends AbstractRaftActorBehavior { } @VisibleForTesting + @SuppressFBWarnings(value = "NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE", + justification = "Unrecognised NullableDecl") void setSnapshotHolder(@Nullable final SnapshotHolder snapshotHolder) { this.snapshotHolder = Optional.fromNullable(snapshotHolder); }