Fixup comparison formatting

[controller.git] / opendaylight / md-sal / sal-akka-raft / src / main / java / org / opendaylight / controller / cluster / raft / RaftActorRecoveryCohort.java

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoveryCohort.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoveryCohort.java
index f948769c9cf9f015200b5ce51d213b0296255240..1f9b93acd7e507f3f837f550697b1fde8eb67ee5 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoveryCohort.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoveryCohort.java
@@ -7,8 +7,7 @@
  */
 package org.opendaylight.controller.cluster.raft;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.controller.cluster.raft.persisted.Snapshot;
 import org.opendaylight.controller.cluster.raft.protobuff.client.messages.Payload;
 
@@ -53,16 +52,5 @@ public interface RaftActorRecoveryCohort {
      *
      * @return the snapshot or null if there's no snapshot to restore
      */
-    @Nullable
-    Snapshot getRestoreFromSnapshot();
-
-    /**
-     * This method is called during recovery to de-serialize a snapshot that was persisted in the pre-Carbon format.
-     *
-     * @param from the snaphot bytes
-     * @return a Snapshot.State instance
-     */
-    @Deprecated
-    @Nonnull
-    Snapshot.State deserializePreCarbonSnapshot(byte [] from);
+    @Nullable Snapshot getRestoreFromSnapshot();
 }