Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-8056: make doCommit/finishCommit package-private
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
messages
/
ShardLeaderStateChanged.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ShardLeaderStateChanged.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ShardLeaderStateChanged.java
index d9a55ab1e98e7c0f752e73035d8f25494e9f34d1..dbd031076c15fdca20b55be61ab5d8284780ad4c 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ShardLeaderStateChanged.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ShardLeaderStateChanged.java
@@
-7,9
+7,10
@@
*/
package org.opendaylight.controller.cluster.datastore.messages;
*/
package org.opendaylight.controller.cluster.datastore.messages;
-import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Preconditions;
+import java.util.Optional;
import javax.annotation.Nonnull;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import org.opendaylight.controller.cluster.notifications.LeaderStateChanged;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
import org.opendaylight.controller.cluster.notifications.LeaderStateChanged;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
@@
-22,15
+23,21
@@
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
*/
public class ShardLeaderStateChanged extends LeaderStateChanged {
*/
public class ShardLeaderStateChanged extends LeaderStateChanged {
- private final
Optional<DataTree>
localShardDataTree;
+ private final
DataTree
localShardDataTree;
- public ShardLeaderStateChanged(@Nonnull String memberId, @N
onnull
String leaderId,
- @Nonnull
Optional<DataTree> localShardDataTree
) {
- super(memberId, leaderId);
+ public ShardLeaderStateChanged(@Nonnull String memberId, @N
ullable
String leaderId,
+ @Nonnull
DataTree localShardDataTree, short leaderPayloadVersion
) {
+ super(memberId, leaderId
, leaderPayloadVersion
);
this.localShardDataTree = Preconditions.checkNotNull(localShardDataTree);
}
this.localShardDataTree = Preconditions.checkNotNull(localShardDataTree);
}
+ public ShardLeaderStateChanged(@Nonnull String memberId, @Nullable String leaderId,
+ short leaderPayloadVersion) {
+ super(memberId, leaderId, leaderPayloadVersion);
+ this.localShardDataTree = null;
+ }
+
public @Nonnull Optional<DataTree> getLocalShardDataTree() {
public @Nonnull Optional<DataTree> getLocalShardDataTree() {
- return
localShardDataTree
;
+ return
Optional.ofNullable(localShardDataTree)
;
}
}
}
}