Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Rename SODIUM versions to NEON_SR2
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
persisted
/
ShardDataTreeSnapshotMetadata.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotMetadata.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotMetadata.java
index 3ba5a91a9cd63e70333b7216966ab9e6a8fb2edb..98302ee503710f9a95cf75b31f69bea6dc5ceefd 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotMetadata.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotMetadata.java
@@
-7,10
+7,11
@@
*/
package org.opendaylight.controller.cluster.datastore.persisted;
*/
package org.opendaylight.controller.cluster.datastore.persisted;
-import com.google.common.base.Verify;
+import static com.google.common.base.Verify.verifyNotNull;
+
import java.io.Externalizable;
import java.io.Serializable;
import java.io.Externalizable;
import java.io.Serializable;
-import
javax.annotation.Nonn
ull;
+import
org.eclipse.jdt.annotation.NonN
ull;
/**
* Base class for various bits of metadata attached to a {@link MetadataShardDataTreeSnapshot}. This class is not
/**
* Base class for various bits of metadata attached to a {@link MetadataShardDataTreeSnapshot}. This class is not
@@
-38,7
+39,7
@@
public abstract class ShardDataTreeSnapshotMetadata<T extends ShardDataTreeSnaps
}
final Object writeReplace() {
}
final Object writeReplace() {
- return
Verify.
verifyNotNull(externalizableProxy(), "Null externalizable proxy from %s", getClass());
+ return verifyNotNull(externalizableProxy(), "Null externalizable proxy from %s", getClass());
}
/**
}
/**
@@
-46,8
+47,7
@@
public abstract class ShardDataTreeSnapshotMetadata<T extends ShardDataTreeSnaps
*
* @return Externalizable proxy, may not be null
*/
*
* @return Externalizable proxy, may not be null
*/
- @Nonnull
- protected abstract Externalizable externalizableProxy();
+ protected abstract @NonNull Externalizable externalizableProxy();
public abstract Class<T> getType();
}
public abstract Class<T> getType();
}