This is an abstract base class, make it abstract and non-instantiable
from outside of the world. It introduces public API, hence we cannot
hide it.
Also switch to using MoreObjects.ToStringHelper, as that allows us to
unify toString().
Change-Id: I21bdd4d0815a50393519414449c7e7eb7179b077
Signed-off-by: Robert Varga <rovarga@cisco.com>
*/
package org.opendaylight.controller.cluster.raft.messages;
*/
package org.opendaylight.controller.cluster.raft.messages;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Preconditions;
import java.io.Serializable;
import java.io.Serializable;
+import java.util.Optional;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
/**
* Abstract base class for a server configuration change reply.
*
* @author Thomas Pantelis
*/
/**
* Abstract base class for a server configuration change reply.
*
* @author Thomas Pantelis
*/
-public class AbstractServerChangeReply implements Serializable {
+public abstract class AbstractServerChangeReply implements Serializable {
private static final long serialVersionUID = 1L;
private final String leaderHint;
private final ServerChangeStatus status;
private static final long serialVersionUID = 1L;
private final String leaderHint;
private final ServerChangeStatus status;
- public AbstractServerChangeReply(ServerChangeStatus status, String leaderHint) {
- this.status = status;
+ AbstractServerChangeReply(final @Nonnull ServerChangeStatus status, final @Nullable String leaderHint) {
+ this.status = Preconditions.checkNotNull(status);
this.leaderHint = leaderHint;
}
this.leaderHint = leaderHint;
}
- public static long getSerialversionuid() {
- return serialVersionUID;
+ @VisibleForTesting
+ @Nonnull public final Optional<String> getLeaderHint() {
+ return Optional.ofNullable(leaderHint);
- public String getLeaderHint() {
- return leaderHint;
- }
-
- public ServerChangeStatus getStatus() {
+ @Nonnull public final ServerChangeStatus getStatus() {
return status;
}
@Override
return status;
}
@Override
- public String toString() {
- return getClass().getSimpleName() + " [status=" + status + ", leaderHint=" + leaderHint + "]";
+ public final String toString() {
+ return MoreObjects.toStringHelper(getClass()).omitNullValues()
+ .add("status", status).add("leaderHint", leaderHint).toString();
*
* @author Thomas Pantelis
*/
*
* @author Thomas Pantelis
*/
-public class AddServerReply extends AbstractServerChangeReply {
+public final class AddServerReply extends AbstractServerChangeReply {
private static final long serialVersionUID = 1L;
public AddServerReply(ServerChangeStatus status, String leaderHint) {
private static final long serialVersionUID = 1L;
public AddServerReply(ServerChangeStatus status, String leaderHint) {
/**
* Reply to a RemoveServer message (§4.1).
*/
/**
* Reply to a RemoveServer message (§4.1).
*/
-public class RemoveServerReply extends AbstractServerChangeReply {
+public final class RemoveServerReply extends AbstractServerChangeReply {
private static final long serialVersionUID = 1L;
public RemoveServerReply(ServerChangeStatus status, @Nullable String leaderHint) {
super(status, leaderHint);
}
private static final long serialVersionUID = 1L;
public RemoveServerReply(ServerChangeStatus status, @Nullable String leaderHint) {
super(status, leaderHint);
}
-
- @Override
- public String toString() {
- return "RemoveServerReply{" + "status=" + getStatus() + ", leaderHint='" + getLeaderHint() + '\'' + '}';
- }
AddServerReply addServerReply = testKit.expectMsgClass(JavaTestKit.duration("5 seconds"), AddServerReply.class);
assertEquals("getStatus", ServerChangeStatus.OK, addServerReply.getStatus());
AddServerReply addServerReply = testKit.expectMsgClass(JavaTestKit.duration("5 seconds"), AddServerReply.class);
assertEquals("getStatus", ServerChangeStatus.OK, addServerReply.getStatus());
- assertEquals("getLeaderHint", LEADER_ID, addServerReply.getLeaderHint());
+ assertEquals("getLeaderHint", LEADER_ID, addServerReply.getLeaderHint().get());
// Verify ServerConfigurationPayload entry in leader's log
// Verify ServerConfigurationPayload entry in leader's log
AddServerReply addServerReply = testKit.expectMsgClass(JavaTestKit.duration("5 seconds"), AddServerReply.class);
assertEquals("getStatus", ServerChangeStatus.OK, addServerReply.getStatus());
AddServerReply addServerReply = testKit.expectMsgClass(JavaTestKit.duration("5 seconds"), AddServerReply.class);
assertEquals("getStatus", ServerChangeStatus.OK, addServerReply.getStatus());
- assertEquals("getLeaderHint", LEADER_ID, addServerReply.getLeaderHint());
+ assertEquals("getLeaderHint", LEADER_ID, addServerReply.getLeaderHint().get());
// Verify ServerConfigurationPayload entry in leader's log
// Verify ServerConfigurationPayload entry in leader's log
AddServerReply addServerReply = testKit.expectMsgClass(JavaTestKit.duration("5 seconds"), AddServerReply.class);
assertEquals("getStatus", ServerChangeStatus.OK, addServerReply.getStatus());
AddServerReply addServerReply = testKit.expectMsgClass(JavaTestKit.duration("5 seconds"), AddServerReply.class);
assertEquals("getStatus", ServerChangeStatus.OK, addServerReply.getStatus());
- assertEquals("getLeaderHint", LEADER_ID, addServerReply.getLeaderHint());
+ assertEquals("getLeaderHint", LEADER_ID, addServerReply.getLeaderHint().get());
// Verify ServerConfigurationPayload entry in leader's log
// Verify ServerConfigurationPayload entry in leader's log
addServerReply = testKit.expectMsgClass(JavaTestKit.duration("5 seconds"), AddServerReply.class);
assertEquals("getStatus", ServerChangeStatus.OK, addServerReply.getStatus());
addServerReply = testKit.expectMsgClass(JavaTestKit.duration("5 seconds"), AddServerReply.class);
assertEquals("getStatus", ServerChangeStatus.OK, addServerReply.getStatus());
- assertEquals("getLeaderHint", LEADER_ID, addServerReply.getLeaderHint());
+ assertEquals("getLeaderHint", java.util.Optional.of(LEADER_ID), addServerReply.getLeaderHint());
expectFirstMatching(leaderCollectorActor, ApplyState.class);
assertEquals("Leader journal last index", 1, leaderActorContext.getReplicatedLog().lastIndex());
expectFirstMatching(leaderCollectorActor, ApplyState.class);
assertEquals("Leader journal last index", 1, leaderActorContext.getReplicatedLog().lastIndex());
AddServerReply addServerReply = testKit.expectMsgClass(JavaTestKit.duration("5 seconds"), AddServerReply.class);
assertEquals("getStatus", ServerChangeStatus.OK, addServerReply.getStatus());
AddServerReply addServerReply = testKit.expectMsgClass(JavaTestKit.duration("5 seconds"), AddServerReply.class);
assertEquals("getStatus", ServerChangeStatus.OK, addServerReply.getStatus());
- assertEquals("getLeaderHint", LEADER_ID, addServerReply.getLeaderHint());
+ assertEquals("getLeaderHint", LEADER_ID, addServerReply.getLeaderHint().get());
expectFirstMatching(newFollowerCollectorActor, ApplySnapshot.class);
expectFirstMatching(newFollowerCollectorActor, ApplySnapshot.class);
// The first AddServer should succeed with OK even though consensus wasn't reached
AddServerReply addServerReply = testKit.expectMsgClass(JavaTestKit.duration("5 seconds"), AddServerReply.class);
assertEquals("getStatus", ServerChangeStatus.OK, addServerReply.getStatus());
// The first AddServer should succeed with OK even though consensus wasn't reached
AddServerReply addServerReply = testKit.expectMsgClass(JavaTestKit.duration("5 seconds"), AddServerReply.class);
assertEquals("getStatus", ServerChangeStatus.OK, addServerReply.getStatus());
- assertEquals("getLeaderHint", LEADER_ID, addServerReply.getLeaderHint());
+ assertEquals("getLeaderHint", LEADER_ID, addServerReply.getLeaderHint().get());
// Verify ServerConfigurationPayload entry in leader's log
verifyServerConfigurationPayloadEntry(leaderActorContext.getReplicatedLog(), votingServer(LEADER_ID),
// Verify ServerConfigurationPayload entry in leader's log
verifyServerConfigurationPayloadEntry(leaderActorContext.getReplicatedLog(), votingServer(LEADER_ID),