Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use NormalizedNode streaming serialization in sal-remoterpc-connector
[controller.git]
/
opendaylight
/
md-sal
/
sal-clustering-commons
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
node
/
utils
/
serialization
/
NormalizedNodeType.java
diff --git
a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeType.java
b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeType.java
index eebd58013ab0ed62897d575b9c82535733a311b8..ab6b1b4cdaeaa273011a66021fb24893364bb437 100644
(file)
--- a/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeType.java
+++ b/
opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeType.java
@@
-39,36
+39,37
@@
public enum NormalizedNodeType {
UNKEYED_LIST_ENTRY_NODE_TYPE,
ANY_XML_NODE_TYPE;
UNKEYED_LIST_ENTRY_NODE_TYPE,
ANY_XML_NODE_TYPE;
- public static NormalizedNodeType getSerializableNodeType(NormalizedNode
node)
{
+ public static NormalizedNodeType getSerializableNodeType(NormalizedNode
<?, ?> node)
{
Preconditions.checkNotNull(node, "node should not be null");
Preconditions.checkNotNull(node, "node should not be null");
- if(node instanceof ContainerNode){
- return CONTAINER_NODE_TYPE;
- } else if(node instanceof LeafNode){
+ if (node instanceof LeafNode) {
return LEAF_NODE_TYPE;
return LEAF_NODE_TYPE;
- } else if
(node instanceof MapNode)
{
- return
MAP
_NODE_TYPE;
- } else if
(node instanceof MapEntryNode)
{
+ } else if
(node instanceof LeafSetEntryNode)
{
+ return
LEAF_SET_ENTRY
_NODE_TYPE;
+ } else if
(node instanceof MapEntryNode)
{
return MAP_ENTRY_NODE_TYPE;
return MAP_ENTRY_NODE_TYPE;
- } else if(node instanceof AugmentationNode){
+ } else if (node instanceof ContainerNode) {
+ return CONTAINER_NODE_TYPE;
+ } else if (node instanceof AugmentationNode) {
return AUGMENTATION_NODE_TYPE;
return AUGMENTATION_NODE_TYPE;
- } else if(node instanceof LeafSetNode){
- return LEAF_SET_NODE_TYPE;
- } else if(node instanceof LeafSetEntryNode){
- return LEAF_SET_ENTRY_NODE_TYPE;
- } else if(node instanceof ChoiceNode){
+ } else if (node instanceof ChoiceNode) {
return CHOICE_NODE_TYPE;
return CHOICE_NODE_TYPE;
- } else if
(node instanceof OrderedLeafSetNode)
{
+ } else if
(node instanceof OrderedLeafSetNode)
{
return ORDERED_LEAF_SET_NODE_TYPE;
return ORDERED_LEAF_SET_NODE_TYPE;
- } else if
(node instanceof OrderedMapNode)
{
+ } else if
(node instanceof OrderedMapNode)
{
return ORDERED_MAP_NODE_TYPE;
return ORDERED_MAP_NODE_TYPE;
- } else if(node instanceof UnkeyedListNode){
+ } else if (node instanceof MapNode) {
+ return MAP_NODE_TYPE;
+ } else if (node instanceof LeafSetNode) {
+ return LEAF_SET_NODE_TYPE;
+ } else if (node instanceof UnkeyedListNode) {
return UNKEYED_LIST_NODE_TYPE;
return UNKEYED_LIST_NODE_TYPE;
- } else if
(node instanceof UnkeyedListEntryNode)
{
+ } else if
(node instanceof UnkeyedListEntryNode)
{
return UNKEYED_LIST_ENTRY_NODE_TYPE;
return UNKEYED_LIST_ENTRY_NODE_TYPE;
- } else if
(node instanceof AnyXmlNode)
{
+ } else if
(node instanceof AnyXmlNode)
{
return ANY_XML_NODE_TYPE;
}
return ANY_XML_NODE_TYPE;
}
+
throw new IllegalArgumentException("Node type unknown : " + node.getClass().getSimpleName());
}
throw new IllegalArgumentException("Node type unknown : " + node.getClass().getSimpleName());
}