X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-clustering-commons%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fnode%2Futils%2Fserialization%2FNormalizedNodeSerializer.java;h=e4ba73c3b1c49e4d8a88c9fed18067ba342f5dc3;hp=fae7eb1a33434bdc52fc3534fe3ee45eee553870;hb=bc6aa356568dac2dca17cfce807df1e2a947e5bf;hpb=d480609098769004b964043d7ee4c7458de19fbc diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java index fae7eb1a33..e4ba73c3b1 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/datastore/node/utils/serialization/NormalizedNodeSerializer.java @@ -8,12 +8,33 @@ package org.opendaylight.controller.cluster.datastore.node.utils.serialization; +import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.ANY_XML_NODE_TYPE; +import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.AUGMENTATION_NODE_TYPE; +import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.CHOICE_NODE_TYPE; +import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.CONTAINER_NODE_TYPE; +import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.LEAF_NODE_TYPE; +import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.LEAF_SET_ENTRY_NODE_TYPE; +import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.LEAF_SET_NODE_TYPE; +import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.MAP_ENTRY_NODE_TYPE; +import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.MAP_NODE_TYPE; +import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.ORDERED_LEAF_SET_NODE_TYPE; +import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.ORDERED_MAP_NODE_TYPE; +import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.UNKEYED_LIST_ENTRY_NODE_TYPE; +import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.UNKEYED_LIST_NODE_TYPE; +import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.getSerializableNodeType; import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; +import java.util.EnumMap; +import java.util.Map; +import javax.xml.transform.dom.DOMSource; import org.opendaylight.controller.cluster.datastore.util.InstanceIdentifierUtils; import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages; import org.opendaylight.controller.protobuff.messages.common.NormalizedNodeMessages.Node.Builder; -import org.opendaylight.yangtools.yang.data.api.Node; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.data.api.schema.AnyXmlNode; import org.opendaylight.yangtools.yang.data.api.schema.AugmentationNode; import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode; @@ -22,33 +43,14 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; import org.opendaylight.yangtools.yang.data.api.schema.LeafNode; import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.OrderedMapNode; import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode; -import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeAttrBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.ListNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeAttrBuilder; -import java.util.EnumMap; -import java.util.Map; -import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.ANY_XML_NODE_TYPE; -import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.AUGMENTATION_NODE_TYPE; -import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.CHOICE_NODE_TYPE; -import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.CONTAINER_NODE_TYPE; -import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.LEAF_NODE_TYPE; -import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.LEAF_SET_ENTRY_NODE_TYPE; -import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.LEAF_SET_NODE_TYPE; -import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.MAP_ENTRY_NODE_TYPE; -import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.MAP_NODE_TYPE; -import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.ORDERED_LEAF_SET_NODE_TYPE; -import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.ORDERED_MAP_NODE_TYPE; -import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.UNKEYED_LIST_ENTRY_NODE_TYPE; -import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.UNKEYED_LIST_NODE_TYPE; -import static org.opendaylight.controller.cluster.datastore.node.utils.serialization.NormalizedNodeType.getSerializableNodeType; /** * NormalizedNodeSerializer can be used to convert a Normalized node to and and @@ -81,12 +83,12 @@ public class NormalizedNodeSerializer { * @param node * @return */ - public static NormalizedNodeMessages.Node serialize(NormalizedNode node){ + public static NormalizedNodeMessages.Node serialize(final NormalizedNode node){ Preconditions.checkNotNull(node, "node should not be null"); return new Serializer(node).serialize(); } - public static Serializer newSerializer(NormalizedNode node) { + public static Serializer newSerializer(final NormalizedNode node) { Preconditions.checkNotNull(node, "node should not be null"); return new Serializer(node); } @@ -97,13 +99,13 @@ public class NormalizedNodeSerializer { * @param node * @return */ - public static NormalizedNode deSerialize(NormalizedNodeMessages.Node node) { + public static NormalizedNode deSerialize(final NormalizedNodeMessages.Node node) { Preconditions.checkNotNull(node, "node should not be null"); return new DeSerializer(null, node).deSerialize(); } - public static DeSerializer newDeSerializer(NormalizedNodeMessages.InstanceIdentifier path, - NormalizedNodeMessages.Node node) { + public static DeSerializer newDeSerializer(final NormalizedNodeMessages.InstanceIdentifier path, + final NormalizedNodeMessages.Node node) { Preconditions.checkNotNull(node, "node should not be null"); return new DeSerializer(path, node); } @@ -121,8 +123,8 @@ public class NormalizedNodeSerializer { * @param pathArgument * @return */ - public static YangInstanceIdentifier.PathArgument deSerialize(NormalizedNodeMessages.Node node, - NormalizedNodeMessages.PathArgument pathArgument){ + public static YangInstanceIdentifier.PathArgument deSerialize(final NormalizedNodeMessages.Node node, + final NormalizedNodeMessages.PathArgument pathArgument){ Preconditions.checkNotNull(node, "node should not be null"); Preconditions.checkNotNull(pathArgument, "pathArgument should not be null"); return new DeSerializer(null, node).deSerialize(pathArgument); @@ -135,7 +137,7 @@ public class NormalizedNodeSerializer { private NormalizedNodeMessages.InstanceIdentifier serializedPath; - private Serializer(NormalizedNode node) { + private Serializer(final NormalizedNode node) { this.node = node; } @@ -147,14 +149,14 @@ public class NormalizedNodeSerializer { return this.serialize(node).addAllCode(getCodes()).build(); } - public NormalizedNodeMessages.Node serialize(YangInstanceIdentifier path) { + public NormalizedNodeMessages.Node serialize(final YangInstanceIdentifier path) { Builder builder = serialize(node); serializedPath = InstanceIdentifierUtils.toSerializable(path, this); return builder.addAllCode(getCodes()).build(); } private NormalizedNodeMessages.Node.Builder serialize( - NormalizedNode node) { + final NormalizedNode node) { NormalizedNodeMessages.Node.Builder builder = NormalizedNodeMessages.Node.newBuilder(); @@ -179,7 +181,7 @@ public class NormalizedNodeSerializer { ValueSerializer.serialize(builder, this, value); } else if (value instanceof Iterable) { - Iterable iterable = (Iterable) value; + Iterable iterable = (Iterable) value; for (Object o : iterable) { if (o instanceof NormalizedNode) { @@ -202,216 +204,126 @@ public class NormalizedNodeSerializer { public static class DeSerializer extends QNameDeSerializationContextImpl implements NormalizedNodeDeSerializationContext { - private static Map - deSerializationFunctions = new EnumMap<>(NormalizedNodeType.class); - + private static final Map DESERIALIZATION_FUNCTIONS; static { - deSerializationFunctions.put(CONTAINER_NODE_TYPE, - new DeSerializationFunction() { - @Override public NormalizedNode apply( - DeSerializer deSerializer, - NormalizedNodeMessages.Node node) { - DataContainerNodeAttrBuilder - builder = Builders.containerBuilder(); - - builder - .withNodeIdentifier(deSerializer.toNodeIdentifier( - node.getPathArgument())); - - return deSerializer.buildDataContainer(builder, node); - - } - - }); - - deSerializationFunctions.put(LEAF_NODE_TYPE, - new DeSerializationFunction() { - @Override public NormalizedNode apply( - DeSerializer deSerializer, - NormalizedNodeMessages.Node node) { - NormalizedNodeAttrBuilder> - builder = Builders.leafBuilder(); - - builder - .withNodeIdentifier(deSerializer.toNodeIdentifier( - node.getPathArgument())); - - return deSerializer.buildNormalizedNode(builder, node); - - } - }); - - deSerializationFunctions.put(MAP_NODE_TYPE, - new DeSerializationFunction() { - @Override public NormalizedNode apply( - DeSerializer deSerializer, - NormalizedNodeMessages.Node node) { - CollectionNodeBuilder - builder = Builders.mapBuilder(); - - return deSerializer.buildCollectionNode(builder, node); - } - }); - - deSerializationFunctions.put(MAP_ENTRY_NODE_TYPE, - new DeSerializationFunction() { - @Override public NormalizedNode apply( - DeSerializer deSerializer, - NormalizedNodeMessages.Node node) { - DataContainerNodeAttrBuilder - builder = Builders.mapEntryBuilder(); - - builder.withNodeIdentifier(deSerializer.toNodeIdentifierWithPredicates( - node.getPathArgument())); - - return deSerializer.buildDataContainer(builder, node); - } - }); - - deSerializationFunctions.put(AUGMENTATION_NODE_TYPE, - new DeSerializationFunction() { - @Override public NormalizedNode apply( - DeSerializer deSerializer, - NormalizedNodeMessages.Node node) { - DataContainerNodeBuilder - builder = Builders.augmentationBuilder(); - - builder.withNodeIdentifier( - deSerializer.toAugmentationIdentifier( - node.getPathArgument())); - - return deSerializer.buildDataContainer(builder, node); - } - }); + final EnumMap m = new EnumMap<>(NormalizedNodeType.class); - deSerializationFunctions.put(LEAF_SET_NODE_TYPE, - new DeSerializationFunction() { - @Override public NormalizedNode apply( - DeSerializer deSerializer, - NormalizedNodeMessages.Node node) { - ListNodeBuilder> - builder = Builders.leafSetBuilder(); + m.put(CONTAINER_NODE_TYPE, new DeSerializationFunction() { + @Override + public NormalizedNode apply(final DeSerializer deSerializer, final NormalizedNodeMessages.Node node) { + DataContainerNodeAttrBuilder builder = Builders.containerBuilder() + .withNodeIdentifier(deSerializer.toNodeIdentifier(node.getPathArgument())); - return deSerializer.buildListNode(builder, node); - } - }); - - deSerializationFunctions.put(LEAF_SET_ENTRY_NODE_TYPE, - new DeSerializationFunction() { - @Override public NormalizedNode apply( - DeSerializer deSerializer, - NormalizedNodeMessages.Node node) { - NormalizedNodeAttrBuilder> - builder = Builders.leafSetEntryBuilder(); - - builder.withNodeIdentifier(deSerializer.toNodeWithValue( - node.getPathArgument())); - - return deSerializer.buildNormalizedNode(builder, node); - } - }); - - deSerializationFunctions.put(CHOICE_NODE_TYPE, - new DeSerializationFunction() { - @Override public NormalizedNode apply( - DeSerializer deSerializer, - NormalizedNodeMessages.Node node) { - DataContainerNodeBuilder - builder = - Builders.choiceBuilder(); - - builder - .withNodeIdentifier(deSerializer.toNodeIdentifier( + return deSerializer.buildDataContainer(builder, node); + } + }); + m.put(LEAF_NODE_TYPE, new DeSerializationFunction() { + @Override + public NormalizedNode apply(final DeSerializer deSerializer, final NormalizedNodeMessages.Node node) { + NormalizedNodeAttrBuilder> builder = Builders.leafBuilder() + .withNodeIdentifier(deSerializer.toNodeIdentifier(node.getPathArgument())); + + return deSerializer.buildNormalizedNode(builder, node); + } + }); + m.put(MAP_NODE_TYPE, new DeSerializationFunction() { + @Override + public NormalizedNode apply(final DeSerializer deSerializer, final NormalizedNodeMessages.Node node) { + return deSerializer.buildCollectionNode(Builders.mapBuilder(), node); + } + }); + m.put(MAP_ENTRY_NODE_TYPE, new DeSerializationFunction() { + @Override + public NormalizedNode apply(final DeSerializer deSerializer, final NormalizedNodeMessages.Node node) { + DataContainerNodeAttrBuilder builder = + Builders.mapEntryBuilder().withNodeIdentifier(deSerializer.toNodeIdentifierWithPredicates( node.getPathArgument())); - return deSerializer.buildDataContainer(builder, node); - } - }); - - deSerializationFunctions.put(ORDERED_LEAF_SET_NODE_TYPE, - new DeSerializationFunction() { - @Override public NormalizedNode apply( - DeSerializer deSerializer, - NormalizedNodeMessages.Node node) { - ListNodeBuilder> - builder = - Builders.orderedLeafSetBuilder(); - - return deSerializer.buildListNode(builder, node); - - - } - }); - - deSerializationFunctions.put(ORDERED_MAP_NODE_TYPE, - new DeSerializationFunction() { - @Override public NormalizedNode apply( - DeSerializer deSerializer, - NormalizedNodeMessages.Node node) { - CollectionNodeBuilder - builder = - Builders.orderedMapBuilder(); - - return deSerializer.buildCollectionNode(builder, node); - } - }); - - deSerializationFunctions.put(UNKEYED_LIST_NODE_TYPE, - new DeSerializationFunction() { - @Override public NormalizedNode apply( - DeSerializer deSerializer, - NormalizedNodeMessages.Node node) { - CollectionNodeBuilder - builder = - Builders.unkeyedListBuilder(); - - return deSerializer.buildCollectionNode(builder, node); - } - }); - - deSerializationFunctions.put(UNKEYED_LIST_ENTRY_NODE_TYPE, - new DeSerializationFunction() { - @Override public NormalizedNode apply( - DeSerializer deSerializer, - NormalizedNodeMessages.Node node) { - DataContainerNodeAttrBuilder - builder = - Builders.unkeyedListEntryBuilder(); - - builder - .withNodeIdentifier(deSerializer.toNodeIdentifier( + return deSerializer.buildDataContainer(builder, node); + } + }); + m.put(AUGMENTATION_NODE_TYPE, new DeSerializationFunction() { + @Override + public NormalizedNode apply(final DeSerializer deSerializer, final NormalizedNodeMessages.Node node) { + DataContainerNodeBuilder builder = + Builders.augmentationBuilder().withNodeIdentifier( + deSerializer.toAugmentationIdentifier(node.getPathArgument())); + + return deSerializer.buildDataContainer(builder, node); + } + }); + m.put(LEAF_SET_NODE_TYPE, new DeSerializationFunction() { + @Override + public NormalizedNode apply(final DeSerializer deSerializer, final NormalizedNodeMessages.Node node) { + return deSerializer.buildListNode(Builders.leafSetBuilder(), node); + } + }); + m.put(LEAF_SET_ENTRY_NODE_TYPE, new DeSerializationFunction() { + @Override + public NormalizedNode apply(final DeSerializer deSerializer, final NormalizedNodeMessages.Node node) { + NormalizedNodeAttrBuilder> builder = + Builders.leafSetEntryBuilder().withNodeIdentifier(deSerializer.toNodeWithValue( node.getPathArgument())); - return deSerializer.buildDataContainer(builder, node); - } - }); - - deSerializationFunctions.put(ANY_XML_NODE_TYPE, - new DeSerializationFunction() { - - @Override public NormalizedNode apply( - DeSerializer deSerializer, - NormalizedNodeMessages.Node node) { - NormalizedNodeAttrBuilder, AnyXmlNode> - builder = - Builders.anyXmlBuilder(); - - builder - .withNodeIdentifier(deSerializer.toNodeIdentifier( + return deSerializer.buildNormalizedNode(builder, node); + } + }); + m.put(CHOICE_NODE_TYPE, new DeSerializationFunction() { + @Override + public NormalizedNode apply(final DeSerializer deSerializer, final NormalizedNodeMessages.Node node) { + DataContainerNodeBuilder builder = Builders.choiceBuilder() + .withNodeIdentifier(deSerializer.toNodeIdentifier(node.getPathArgument())); + + return deSerializer.buildDataContainer(builder, node); + } + }); + m.put(ORDERED_LEAF_SET_NODE_TYPE, new DeSerializationFunction() { + @Override + public NormalizedNode apply(final DeSerializer deSerializer, final NormalizedNodeMessages.Node node) { + return deSerializer.buildListNode(Builders.orderedLeafSetBuilder(), node); + } + }); + m.put(ORDERED_MAP_NODE_TYPE, new DeSerializationFunction() { + @Override + public NormalizedNode apply(final DeSerializer deSerializer, final NormalizedNodeMessages.Node node) { + return deSerializer.buildCollectionNode(Builders.orderedMapBuilder(), node); + } + }); + m.put(UNKEYED_LIST_NODE_TYPE, new DeSerializationFunction() { + @Override + public NormalizedNode apply(final DeSerializer deSerializer, final NormalizedNodeMessages.Node node) { + return deSerializer.buildCollectionNode(Builders.unkeyedListBuilder(), node); + } + }); + m.put(UNKEYED_LIST_ENTRY_NODE_TYPE, new DeSerializationFunction() { + @Override + public NormalizedNode apply(final DeSerializer deSerializer, final NormalizedNodeMessages.Node node) { + DataContainerNodeAttrBuilder builder = + Builders.unkeyedListEntryBuilder().withNodeIdentifier(deSerializer.toNodeIdentifier( node.getPathArgument())); - return deSerializer.buildNormalizedNode(builder, node); - } - }); + return deSerializer.buildDataContainer(builder, node); + } + }); + m.put(ANY_XML_NODE_TYPE, new DeSerializationFunction() { + @Override + public NormalizedNode apply(final DeSerializer deSerializer, final NormalizedNodeMessages.Node node) { + NormalizedNodeAttrBuilder builder = Builders.anyXmlBuilder() + .withNodeIdentifier(deSerializer.toNodeIdentifier(node.getPathArgument())); + + return deSerializer.buildNormalizedNode(builder, node); + } + }); + DESERIALIZATION_FUNCTIONS = Maps.immutableEnumMap(m); } private final NormalizedNodeMessages.Node node; private final NormalizedNodeMessages.InstanceIdentifier path; private YangInstanceIdentifier deserializedPath; - public DeSerializer(NormalizedNodeMessages.InstanceIdentifier path, - NormalizedNodeMessages.Node node) { + public DeSerializer(final NormalizedNodeMessages.InstanceIdentifier path, + final NormalizedNodeMessages.Node node) { super(node.getCodeList()); this.path = path; this.node = node; @@ -430,10 +342,10 @@ public class NormalizedNodeSerializer { return deserializedNode; } - private NormalizedNode deSerialize(NormalizedNodeMessages.Node node){ + private NormalizedNode deSerialize(final NormalizedNodeMessages.Node node){ Preconditions.checkNotNull(node, "node should not be null"); - DeSerializationFunction deSerializationFunction = deSerializationFunctions.get( + DeSerializationFunction deSerializationFunction = DESERIALIZATION_FUNCTIONS.get( NormalizedNodeType.values()[node.getIntType()]); return deSerializationFunction.apply(this, node); @@ -441,8 +353,8 @@ public class NormalizedNodeSerializer { private NormalizedNode buildCollectionNode( - CollectionNodeBuilder builder, - NormalizedNodeMessages.Node node) { + final CollectionNodeBuilder builder, + final NormalizedNodeMessages.Node node) { builder.withNodeIdentifier(toNodeIdentifier(node.getPathArgument())); @@ -455,8 +367,8 @@ public class NormalizedNodeSerializer { private NormalizedNode buildListNode( - ListNodeBuilder> builder, - NormalizedNodeMessages.Node node) { + final ListNodeBuilder> builder, + final NormalizedNodeMessages.Node node) { builder.withNodeIdentifier(toNodeIdentifier(node.getPathArgument())); for(NormalizedNodeMessages.Node child : node.getChildList()){ @@ -466,7 +378,7 @@ public class NormalizedNodeSerializer { return builder.build(); } - private NormalizedNode buildDataContainer(DataContainerNodeBuilder builder, NormalizedNodeMessages.Node node){ + private NormalizedNode buildDataContainer(final DataContainerNodeBuilder builder, final NormalizedNodeMessages.Node node){ for(NormalizedNodeMessages.Node child : node.getChildList()){ builder.withChild((DataContainerChild) deSerialize(child)); @@ -477,7 +389,7 @@ public class NormalizedNodeSerializer { return builder.build(); } - private NormalizedNode buildNormalizedNode(NormalizedNodeAttrBuilder builder, NormalizedNodeMessages.Node node){ + private NormalizedNode buildNormalizedNode(final NormalizedNodeAttrBuilder builder, final NormalizedNodeMessages.Node node){ builder.withValue(ValueSerializer.deSerialize(this, node)); @@ -487,34 +399,29 @@ public class NormalizedNodeSerializer { } - - private YangInstanceIdentifier.NodeIdentifierWithPredicates toNodeIdentifierWithPredicates( - NormalizedNodeMessages.PathArgument path) { - return (YangInstanceIdentifier.NodeIdentifierWithPredicates) PathArgumentSerializer.deSerialize(this, path); + private NodeIdentifierWithPredicates toNodeIdentifierWithPredicates( + final NormalizedNodeMessages.PathArgument path) { + return (NodeIdentifierWithPredicates) PathArgumentSerializer.deSerialize(this, path); } - private YangInstanceIdentifier.AugmentationIdentifier toAugmentationIdentifier( - NormalizedNodeMessages.PathArgument path) { - return (YangInstanceIdentifier.AugmentationIdentifier) PathArgumentSerializer.deSerialize(this, path); + private AugmentationIdentifier toAugmentationIdentifier(final NormalizedNodeMessages.PathArgument path) { + return (AugmentationIdentifier) PathArgumentSerializer.deSerialize(this, path); } - private YangInstanceIdentifier.NodeWithValue toNodeWithValue( - NormalizedNodeMessages.PathArgument path) { - return (YangInstanceIdentifier.NodeWithValue) PathArgumentSerializer.deSerialize( - this, path); + @SuppressWarnings("unchecked") + private NodeWithValue toNodeWithValue(final NormalizedNodeMessages.PathArgument path) { + return (NodeWithValue) PathArgumentSerializer.deSerialize(this, path); } - private YangInstanceIdentifier.NodeIdentifier toNodeIdentifier(NormalizedNodeMessages.PathArgument path){ - return (YangInstanceIdentifier.NodeIdentifier) PathArgumentSerializer.deSerialize( - this, path); + private NodeIdentifier toNodeIdentifier(final NormalizedNodeMessages.PathArgument path){ + return (NodeIdentifier) PathArgumentSerializer.deSerialize(this, path); } - public YangInstanceIdentifier.PathArgument deSerialize( - NormalizedNodeMessages.PathArgument pathArgument) { + public YangInstanceIdentifier.PathArgument deSerialize(final NormalizedNodeMessages.PathArgument pathArgument) { return PathArgumentSerializer.deSerialize(this, pathArgument); } - private static interface DeSerializationFunction { + private interface DeSerializationFunction { NormalizedNode apply(DeSerializer deserializer, NormalizedNodeMessages.Node node); } }