Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Bug 1333: Regression Test suite."
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
messages
/
MergeData.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/MergeData.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/MergeData.java
index 5ab77419661c6f2744d5baa21b36d1cef053e5a6..ba790816c4aefa72d5db0e97b392af205e979f4b 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/MergeData.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/MergeData.java
@@
-10,26
+10,34
@@
package org.opendaylight.controller.cluster.datastore.messages;
import org.opendaylight.controller.cluster.datastore.node.NormalizedNodeToNodeCodec;
import org.opendaylight.controller.cluster.datastore.utils.InstanceIdentifierUtils;
import org.opendaylight.controller.cluster.datastore.node.NormalizedNodeToNodeCodec;
import org.opendaylight.controller.cluster.datastore.utils.InstanceIdentifierUtils;
+import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages;
import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages;
import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.
Yang
InstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
public class MergeData extends ModifyData{
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
public class MergeData extends ModifyData{
- public MergeData(InstanceIdentifier path, NormalizedNode<?, ?> data,
+
+ public static final Class SERIALIZABLE_CLASS = ShardTransactionMessages.MergeData.class;
+
+ public MergeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data,
SchemaContext context) {
super(path, data, context);
}
@Override public Object toSerializable() {
SchemaContext context) {
super(path, data, context);
}
@Override public Object toSerializable() {
+
+ NormalizedNodeMessages.Node normalizedNode =
+ new NormalizedNodeToNodeCodec(schemaContext).encode(path, data)
+ .getNormalizedNode();
return ShardTransactionMessages.MergeData.newBuilder()
return ShardTransactionMessages.MergeData.newBuilder()
- .setInstanceIdentifierPathArguments(InstanceIdentifierUtils.
getParentPath(path.toString()
))
- .setNormalizedNode(n
ew NormalizedNodeToNodeCodec(schemaContext).encode(path, data).getNormalizedNode()
).build();
+ .setInstanceIdentifierPathArguments(InstanceIdentifierUtils.
toSerializable(path
))
+ .setNormalizedNode(n
ormalizedNode
).build();
}
public static MergeData fromSerializable(Object serializable, SchemaContext schemaContext){
ShardTransactionMessages.MergeData o = (ShardTransactionMessages.MergeData) serializable;
}
public static MergeData fromSerializable(Object serializable, SchemaContext schemaContext){
ShardTransactionMessages.MergeData o = (ShardTransactionMessages.MergeData) serializable;
-
InstanceIdentifier identifier = InstanceIdentifierUtils.from
(o.getInstanceIdentifierPathArguments());
+
YangInstanceIdentifier identifier = InstanceIdentifierUtils.fromSerializable
(o.getInstanceIdentifierPathArguments());
NormalizedNode<?, ?> normalizedNode =
new NormalizedNodeToNodeCodec(schemaContext)
NormalizedNode<?, ?> normalizedNode =
new NormalizedNodeToNodeCodec(schemaContext)