Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump persisted PayloadVersion
[controller.git]
/
opendaylight
/
md-sal
/
sal-akka-raft
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
raft
/
persisted
/
DeleteEntries.java
diff --git
a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/DeleteEntries.java
b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/DeleteEntries.java
index 5650360c5ff89d24a09d1021066611fea44116f9..57f5af3a034e90d31f716eea1da38626832f593f 100644
(file)
--- a/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/DeleteEntries.java
+++ b/
opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/DeleteEntries.java
@@
-18,12
+18,15
@@
import java.io.Serializable;
*
* @author Thomas Pantelis
*/
*
* @author Thomas Pantelis
*/
-public class DeleteEntries implements Serializable
, MigratedSerializable
{
+public class DeleteEntries implements Serializable {
private static final class Proxy implements Externalizable {
private static final long serialVersionUID = 1L;
private DeleteEntries deleteEntries;
private static final class Proxy implements Externalizable {
private static final long serialVersionUID = 1L;
private DeleteEntries deleteEntries;
+ // 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
}
@@
-35,10
+38,10
@@
public class DeleteEntries implements Serializable, MigratedSerializable {
@Override
public void writeExternal(final ObjectOutput out) throws IOException {
out.writeLong(deleteEntries.fromIndex);
@Override
public void writeExternal(final ObjectOutput out) throws IOException {
out.writeLong(deleteEntries.fromIndex);
-
}
+ }
@Override
@Override
- public void readExternal(final ObjectInput in) throws IOException
, ClassNotFoundException
{
+ public void readExternal(final ObjectInput in) throws IOException {
deleteEntries = new DeleteEntries(in.readLong());
}
deleteEntries = new DeleteEntries(in.readLong());
}
@@
-50,36
+53,19
@@
public class DeleteEntries implements Serializable, MigratedSerializable {
private static final long serialVersionUID = 1L;
private final long fromIndex;
private static final long serialVersionUID = 1L;
private final long fromIndex;
- private final boolean migrated;
-
- private DeleteEntries(final long fromIndex, final boolean migrated) {
- this.fromIndex = fromIndex;
- this.migrated = migrated;
- }
public DeleteEntries(final long fromIndex) {
public DeleteEntries(final long fromIndex) {
- this
(fromIndex, false)
;
+ this
.fromIndex = fromIndex
;
}
public long getFromIndex() {
return fromIndex;
}
}
public long getFromIndex() {
return fromIndex;
}
- @Override
- public boolean isMigrated() {
- return migrated;
- }
-
- @Override
- public Object writeReplace() {
+ private Object writeReplace() {
return new Proxy(this);
}
return new Proxy(this);
}
- @Deprecated
- public static DeleteEntries createMigrated(final long fromIndex) {
- return new DeleteEntries(fromIndex, true);
- }
-
@Override
public String toString() {
return "DeleteEntries [fromIndex=" + fromIndex + "]";
@Override
public String toString() {
return "DeleteEntries [fromIndex=" + fromIndex + "]";