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 <skitt@redhat.com>

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 139f1e1ca56c0473d6e6301d59dbccd52abbd014..57eb2647c9ebbc3ab345b93b16bcbfde44a65b1c 100644 (file)
--- 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) {
 
 
     protected void onLeaderChanged(String oldLeader, String newLeader) {
 

-    };
+    }

 
     private String getLeaderAddress(){
         if(isLeader()){
 
     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 5c5b947404a6bc2e81f4ffed03180e42be36e6e0..3ec4d2237b36b3ce23d588de799333f4e3b0e1e3 100644 (file)
--- 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,
     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 a362c6f683be25d108589a36bbfc5cbb6152c455..3fc43c7fd1457c126b4cf4cf40285844401341e9 100644 (file)
--- 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();
     }
         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 180f492082ee05bde4477cd82add5a0c4d846f69..479ca5ae7b3c40454daac580f9ebc561a11ea3d9 100644 (file)
--- 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<ClientRequestTracker> trackers = new LinkedList<>();
 
     private Cancellable heartbeatSchedule = null;
     private final Queue<ClientRequestTracker> trackers = new LinkedList<>();
 
     private Cancellable heartbeatSchedule = null;

-    private Optional<SnapshotHolder> snapshot = Optional.absent();;
+    private Optional<SnapshotHolder> snapshot = Optional.absent();

     private int minReplicationCount;
 
     protected AbstractLeader(RaftActorContext context, RaftState state,
     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 5c9c0b749c8dcfcf772b5723bd10c0e6923ee872..cb141f9f1e5b28f3c7a3f7428ad827d5706881d0 100644 (file)
--- 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(),
             if(snapshotTracker.addChunk(installSnapshot.getChunkIndex(), installSnapshot.getData(),
                     installSnapshot.getLastChunkHashCode())){
                 Snapshot snapshot = Snapshot.create(snapshotTracker.getSnapshot(),

-                        new ArrayList<ReplicatedLogEntry>(),
+                        new ArrayList<>(),

                         installSnapshot.getLastIncludedIndex(),
                         installSnapshot.getLastIncludedTerm(),
                         installSnapshot.getLastIncludedIndex(),
                         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 5b6f030431e217016f7156b3c56172ba9e09fae1..5958cfdedf9d7460001cf93cbeda28436da6c383 100644 (file)
--- 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 <T extends Object> Object toSerializable(short version) {
+    public <T> Object toSerializable(short version) {

         return this;
     }
 
         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 4d12d3543fe2966b2560d12f47ad118f3abe6c43..b3c16670fa0cea7997aa1173ea5c669b685864e5 100644 (file)
--- 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
      */
      *
      * @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 bb50a740ba7ca7b6a260a2125a9d965e8812d28d..32d3ae6092e521455a987bd06f065200e906df3d 100644 (file)
--- 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(){
     }
 
     public MockRaftActorContext(){

-        super(null, null, "test", newElectionTerm(), -1, -1, new HashMap<String, String>(),
+        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){
                 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<String, String>(),
+        super(actor, null, id, newElectionTerm(), -1, -1, new HashMap<>(),

                 new DefaultConfigParamsImpl(), new NonPersistentDataProvider(), LOG);
 
         this.system = system;
                 new DefaultConfigParamsImpl(), new NonPersistentDataProvider(), LOG);
 
         this.system = system;