From b2cb02f62ab7c7599e8d94fe92d1ce63e17d599b Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 22 Sep 2016 18:21:18 +0200 Subject: [PATCH] Mechanical code cleanup (sal-akka-raft) * Remove unnecessary type specifiers (use Java 7 <>) * Remove unnecessary "extends Object" declarations * Remove unnecessary semi-colons * Merge identical catch blocks * Remove redundant modifiers: - enum constructors are private by default - interface properties are public static final by default - interface methods are public abstract by default - interfaces are abstract by default - inner interfaces are static by default - inner classes in interfaces are public static by default Change-Id: I02567e9b21a73406863797a5a4eaa257e6eb20f2 Signed-off-by: Stephen Kitt --- .../org/opendaylight/controller/cluster/raft/RaftActor.java | 2 +- .../org/opendaylight/controller/cluster/raft/RaftState.java | 2 +- .../opendaylight/controller/cluster/raft/SnapshotManager.java | 2 +- .../controller/cluster/raft/behaviors/AbstractLeader.java | 2 +- .../controller/cluster/raft/behaviors/Follower.java | 2 +- .../controller/cluster/raft/messages/InstallSnapshot.java | 2 +- .../controller/cluster/raft/messages/RaftRPC.java | 2 +- .../controller/cluster/raft/MockRaftActorContext.java | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java index 139f1e1ca5..57eb2647c9 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActor.java @@ -785,7 +785,7 @@ public abstract class RaftActor extends AbstractUntypedPersistentActor { protected void onLeaderChanged(String oldLeader, String newLeader) { - }; + } private String getLeaderAddress(){ if(isLeader()){ diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftState.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftState.java index 5c5b947404..3ec4d2237b 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftState.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftState.java @@ -13,5 +13,5 @@ public enum RaftState { Follower, Leader, IsolatedLeader, - PreLeader; + PreLeader } diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java index a362c6f683..3fc43c7fd1 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java @@ -455,7 +455,7 @@ public class SnapshotManager implements SnapshotState { } - private static interface TermInformationReader { + private interface TermInformationReader { long getIndex(); long getTerm(); } 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 180f492082..479ca5ae7b 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 @@ -83,7 +83,7 @@ public abstract class AbstractLeader extends AbstractRaftActorBehavior { private final Queue trackers = new LinkedList<>(); private Cancellable heartbeatSchedule = null; - private Optional snapshot = Optional.absent();; + private Optional snapshot = Optional.absent(); private int minReplicationCount; protected AbstractLeader(RaftActorContext context, RaftState state, diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java index 5c9c0b749c..cb141f9f1e 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java @@ -516,7 +516,7 @@ public class Follower extends AbstractRaftActorBehavior { if(snapshotTracker.addChunk(installSnapshot.getChunkIndex(), installSnapshot.getData(), installSnapshot.getLastChunkHashCode())){ Snapshot snapshot = Snapshot.create(snapshotTracker.getSnapshot(), - new ArrayList(), + new ArrayList<>(), installSnapshot.getLastIncludedIndex(), installSnapshot.getLastIncludedTerm(), installSnapshot.getLastIncludedIndex(), diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java index 5b6f030431..5958cfdedf 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java @@ -79,7 +79,7 @@ public class InstallSnapshot extends AbstractRaftRPC { } - public Object toSerializable(short version) { + public Object toSerializable(short version) { return this; } diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RaftRPC.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RaftRPC.java index 4d12d3543f..b3c16670fa 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RaftRPC.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/RaftRPC.java @@ -19,5 +19,5 @@ public interface RaftRPC extends Serializable { * * @return The term ID */ - public long getTerm(); + long getTerm(); } diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java index bb50a740ba..32d3ae6092 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/MockRaftActorContext.java @@ -60,13 +60,13 @@ public class MockRaftActorContext extends RaftActorContextImpl { } public MockRaftActorContext(){ - super(null, null, "test", newElectionTerm(), -1, -1, new HashMap(), + super(null, null, "test", newElectionTerm(), -1, -1, new HashMap<>(), new DefaultConfigParamsImpl(), new NonPersistentDataProvider(), LOG); setReplicatedLog(new MockReplicatedLogBuilder().build()); } public MockRaftActorContext(String id, ActorSystem system, ActorRef actor){ - super(actor, null, id, newElectionTerm(), -1, -1, new HashMap(), + super(actor, null, id, newElectionTerm(), -1, -1, new HashMap<>(), new DefaultConfigParamsImpl(), new NonPersistentDataProvider(), LOG); this.system = system; -- 2.36.6