X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-common-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fcommon%2Fimpl%2Futil%2Fcompat%2FDataNormalizationOperation.java;h=2b9694bed71d87dfb8d48e04024b94f619e5c049;hp=7ce475dd59ea1a056ac8d5a85d751a33f6d9a17f;hb=c1362c86eb19e92e6c64d10099a45deb499c6db1;hpb=5e7328e70f420ee4460a9f64f10368175c851370 diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java index 7ce475dd59..2b9694bed7 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java @@ -14,6 +14,7 @@ import com.google.common.base.Optional; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; + import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -21,6 +22,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; + import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.CompositeNode; @@ -156,7 +158,7 @@ public abstract class DataNormalizationOperation impleme } private static abstract class CompositeNodeNormalizationOperation extends - DataNormalizationOperation { + DataNormalizationOperation { protected CompositeNodeNormalizationOperation(final T identifier) { super(identifier); @@ -218,7 +220,7 @@ public abstract class DataNormalizationOperation impleme } private static abstract class DataContainerNormalizationOperation extends - CompositeNodeNormalizationOperation { + CompositeNodeNormalizationOperation { private final DataNodeContainer schema; private final Map> byQName; @@ -276,7 +278,7 @@ public abstract class DataNormalizationOperation impleme } private static final class ListItemNormalization extends - DataContainerNormalizationOperation { + DataContainerNormalizationOperation { private final List keyDefinition; @@ -356,7 +358,7 @@ public abstract class DataNormalizationOperation impleme } private static abstract class MixinNormalizationOp extends - CompositeNodeNormalizationOperation { + CompositeNodeNormalizationOperation { protected MixinNormalizationOp(final T identifier) { super(identifier); @@ -615,25 +617,25 @@ public abstract class DataNormalizationOperation impleme private static class AnyXmlNormalization extends DataNormalizationOperation { - protected AnyXmlNormalization( NodeIdentifier identifier ) { + protected AnyXmlNormalization( final NodeIdentifier identifier ) { super( identifier ); } @Override - public DataNormalizationOperation getChild( PathArgument child ) throws DataNormalizationException { + public DataNormalizationOperation getChild( final PathArgument child ) throws DataNormalizationException { return null; } @Override - public DataNormalizationOperation getChild( QName child ) throws DataNormalizationException { + public DataNormalizationOperation getChild( final QName child ) throws DataNormalizationException { return null; } @Override - public NormalizedNode normalize( Node legacyData ) { + public NormalizedNode normalize( final Node legacyData ) { NormalizedNodeAttrBuilder, AnyXmlNode> builder = Builders.anyXmlBuilder().withNodeIdentifier( - new NodeIdentifier( legacyData.getNodeType() ) ); + new NodeIdentifier( legacyData.getNodeType() ) ); builder.withValue(legacyData); return builder.build(); } @@ -644,7 +646,7 @@ public abstract class DataNormalizationOperation impleme } @Override - public NormalizedNode createDefault( PathArgument currentArg ) { + public NormalizedNode createDefault( final PathArgument currentArg ) { return null; } } @@ -694,7 +696,7 @@ public abstract class DataNormalizationOperation impleme for (DataSchemaNode child : augmentation.getChildNodes()) { potentialChildren.add(child.getQName()); } - return new AugmentationIdentifier(null, potentialChildren.build()); + return new AugmentationIdentifier(potentialChildren.build()); } private static DataNodeContainer augmentationProxy(final AugmentationSchema augmentation, final DataNodeContainer schema) {