Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove deprecated persisted raft payloads
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
persisted
/
ApplyJournalEntries.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/ApplyJournalEntries.java
b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/ApplyJournalEntries.java
index a21c959a9ac4d737387db6bf7ddbe501275841ab..604542706542007c09ba61ea3d90a989c653f0d6 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/ApplyJournalEntries.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/ApplyJournalEntries.java
@@
-21,12
+21,15
@@
import java.io.Serializable;
*
* @author Thomas Pantelis
*/
*
* @author Thomas Pantelis
*/
-public class ApplyJournalEntries implements Serializable
, MigratedSerializable
{
+public class ApplyJournalEntries implements Serializable {
private static final class Proxy implements Externalizable {
private static final long serialVersionUID = 1L;
private ApplyJournalEntries applyEntries;
private static final class Proxy implements Externalizable {
private static final long serialVersionUID = 1L;
private ApplyJournalEntries applyEntries;
+ // checkstyle flags the public modifier as redundant which really doesn't make sense since it clearly isn't
+ // redundant. It is explicitly needed for Java serialization to be able to create instances via reflection.
+ @SuppressWarnings("checkstyle:RedundantModifier")
public Proxy() {
// For Externalizable
}
public Proxy() {
// For Externalizable
}
@@
-38,7
+41,7
@@
public class ApplyJournalEntries implements Serializable, MigratedSerializable {
@Override
public void writeExternal(final ObjectOutput out) throws IOException {
out.writeLong(applyEntries.toIndex);
@Override
public void writeExternal(final ObjectOutput out) throws IOException {
out.writeLong(applyEntries.toIndex);
-
}
+ }
@Override
public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
@Override
public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
@@
-53,36
+56,19
@@
public class ApplyJournalEntries implements Serializable, MigratedSerializable {
private static final long serialVersionUID = 1L;
private final long toIndex;
private static final long serialVersionUID = 1L;
private final long toIndex;
- private final boolean migrated;
-
- private ApplyJournalEntries(final long toIndex, final boolean migrated) {
- this.toIndex = toIndex;
- this.migrated = migrated;
- }
public ApplyJournalEntries(final long toIndex) {
public ApplyJournalEntries(final long toIndex) {
- this
(toIndex, false)
;
+ this
.toIndex = toIndex
;
}
public long getToIndex() {
return toIndex;
}
}
public long getToIndex() {
return toIndex;
}
- @Override
- public boolean isMigrated() {
- return migrated;
- }
-
- @Override
- public Object writeReplace() {
+ private Object writeReplace() {
return new Proxy(this);
}
return new Proxy(this);
}
- @Deprecated
- public static ApplyJournalEntries createMigrated(final long fromIndex) {
- return new ApplyJournalEntries(fromIndex, true);
- }
-
@Override
public String toString() {
return "ApplyJournalEntries [toIndex=" + toIndex + "]";
@Override
public String toString() {
return "ApplyJournalEntries [toIndex=" + toIndex + "]";