X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?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=4dbd7db03e64992e3ae566fe9c6d7fb52fddb346;hb=refs%2Fchanges%2F02%2F83802%2F42;hp=6e9d9fd82b3b96b81985452ea074458a368e6b1b;hpb=e631dc96f0461b2270377dc072b9f969a875667a;p=controller.git 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 6e9d9fd82b..4dbd7db03e 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 @@ -8,9 +8,10 @@ package org.opendaylight.controller.md.sal.common.impl.util.compat; 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 com.google.common.collect.Iterables; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -18,6 +19,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import org.eclipse.jdt.annotation.Nullable; +import org.gaul.modernizer_maven_annotations.SuppressModernizer; import org.opendaylight.yangtools.concepts.Identifiable; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; @@ -28,11 +31,11 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgum import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -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.model.api.AnyXmlSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; +import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; -import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -42,26 +45,22 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; +import org.opendaylight.yangtools.yang.model.util.EffectiveAugmentationSchema; @Deprecated public abstract class DataNormalizationOperation implements Identifiable { private final T identifier; - private final Optional dataSchemaNode; + private final DataSchemaNode dataSchemaNode; @Override public T getIdentifier() { return identifier; - }; + } protected DataNormalizationOperation(final T identifier, final SchemaNode schema) { - super(); this.identifier = identifier; - if(schema instanceof DataSchemaNode) { - this.dataSchemaNode = Optional.of((DataSchemaNode) schema); - } else { - this.dataSchemaNode = Optional.absent(); - } + dataSchemaNode = schema instanceof DataSchemaNode ? (DataSchemaNode)schema : null; } public boolean isMixin() { @@ -77,21 +76,20 @@ public abstract class DataNormalizationOperation impleme return Collections.singleton(identifier.getNodeType()); } - public abstract DataNormalizationOperation getChild(final PathArgument child) throws DataNormalizationException; + public abstract DataNormalizationOperation getChild(PathArgument child) throws DataNormalizationException; public abstract DataNormalizationOperation getChild(QName child) throws DataNormalizationException; - public abstract boolean isLeaf(); + @SuppressModernizer public Optional getDataSchemaNode() { - // FIXME - return dataSchemaNode; + return Optional.fromNullable(dataSchemaNode); } - private static abstract class SimpleTypeNormalization extends DataNormalizationOperation { - - protected SimpleTypeNormalization(final T identifier, final DataSchemaNode potential) { + private abstract static class SimpleTypeNormalization + extends DataNormalizationOperation { + SimpleTypeNormalization(final T identifier, final DataSchemaNode potential) { super(identifier,potential); } @@ -114,20 +112,16 @@ public abstract class DataNormalizationOperation impleme public boolean isLeaf() { return true; } - } private static final class LeafNormalization extends SimpleTypeNormalization { - - protected LeafNormalization(final LeafSchemaNode potential) { + LeafNormalization(final LeafSchemaNode potential) { super(new NodeIdentifier(potential.getQName()),potential); } - } private static final class LeafListEntryNormalization extends SimpleTypeNormalization { - - public LeafListEntryNormalization(final LeafListSchemaNode potential) { + LeafListEntryNormalization(final LeafListSchemaNode potential) { super(new NodeWithValue(potential.getQName(), null),potential); } @@ -137,10 +131,9 @@ public abstract class DataNormalizationOperation impleme } } - private static abstract class CompositeNodeNormalizationOperation extends - DataNormalizationOperation { - - protected CompositeNodeNormalizationOperation(final T identifier, final DataSchemaNode schema) { + private abstract static class CompositeNodeNormalizationOperation + extends DataNormalizationOperation { + CompositeNodeNormalizationOperation(final T identifier, final DataSchemaNode schema) { super(identifier,schema); } @@ -148,18 +141,16 @@ public abstract class DataNormalizationOperation impleme public boolean isLeaf() { return false; } - - } - private static abstract class DataContainerNormalizationOperation extends - CompositeNodeNormalizationOperation { - + private abstract static class DataContainerNormalizationOperation + extends CompositeNodeNormalizationOperation { private final DataNodeContainer schema; private final Map> byQName; private final Map> byArg; - protected DataContainerNormalizationOperation(final T identifier, final DataNodeContainer schema, final DataSchemaNode node) { + DataContainerNormalizationOperation(final T identifier, final DataNodeContainer schema, + final DataSchemaNode node) { super(identifier,node); this.schema = schema; this.byArg = new ConcurrentHashMap<>(); @@ -176,14 +167,6 @@ public abstract class DataNormalizationOperation impleme return register(potential); } - private DataNormalizationOperation fromLocalSchema(final PathArgument child) throws DataNormalizationException { - if (child instanceof AugmentationIdentifier) { - return fromSchemaAndQNameChecked(schema, ((AugmentationIdentifier) child).getPossibleChildNames() - .iterator().next()); - } - return fromSchemaAndQNameChecked(schema, child.getNodeType()); - } - @Override public DataNormalizationOperation getChild(final QName child) throws DataNormalizationException { DataNormalizationOperation potential = byQName.get(child); @@ -194,37 +177,60 @@ public abstract class DataNormalizationOperation impleme return register(potential); } - protected DataNormalizationOperation fromLocalSchemaAndQName(final DataNodeContainer schema2, final QName child) throws DataNormalizationException { + private DataNormalizationOperation fromLocalSchema(final PathArgument child) + throws DataNormalizationException { + if (child instanceof AugmentationIdentifier) { + return fromSchemaAndQNameChecked(schema, ((AugmentationIdentifier) child).getPossibleChildNames() + .iterator().next()); + } + return fromSchemaAndQNameChecked(schema, child.getNodeType()); + } + + protected DataNormalizationOperation fromLocalSchemaAndQName(final DataNodeContainer schema2, + final QName child) throws DataNormalizationException { return fromSchemaAndQNameChecked(schema2, child); } private DataNormalizationOperation register(final DataNormalizationOperation potential) { if (potential != null) { byArg.put(potential.getIdentifier(), potential); - for (QName qName : potential.getQNameIdentifiers()) { - byQName.put(qName, potential); + for (final QName qname : potential.getQNameIdentifiers()) { + byQName.put(qname, potential); } } return potential; } - } + private static DataNormalizationOperation fromSchemaAndQNameChecked(final DataNodeContainer schema, + final QName child) throws DataNormalizationException { - private static final class ListItemNormalization extends - DataContainerNormalizationOperation { + final DataSchemaNode result = findChildSchemaNode(schema, child); + if (result == null) { + throw new DataNormalizationException(String.format( + "Supplied QName %s is not valid according to schema %s, potential children nodes: %s", child, + schema,schema.getChildNodes())); + } - private final List keyDefinition; + // We try to look up if this node was added by augmentation + if (schema instanceof DataSchemaNode && result.isAugmenting()) { + return fromAugmentation(schema, (AugmentationTarget) schema, result); + } + return fromDataSchemaNode(result); + } + } - protected ListItemNormalization(final NodeIdentifierWithPredicates identifier, final ListSchemaNode schema) { - super(identifier, schema,schema); - keyDefinition = schema.getKeyDefinition(); + private static final class ListItemNormalization extends + DataContainerNormalizationOperation { + ListItemNormalization(final NodeIdentifierWithPredicates identifier, final ListSchemaNode schema) { + super(identifier, schema, schema); } @Override + @SuppressFBWarnings("BC_UNCONFIRMED_CAST") public NormalizedNode createDefault(final PathArgument currentArg) { - DataContainerNodeAttrBuilder builder = Builders + final DataContainerNodeBuilder builder = Builders .mapEntryBuilder().withNodeIdentifier((NodeIdentifierWithPredicates) currentArg); - for (Entry keyValue : ((NodeIdentifierWithPredicates) currentArg).getKeyValues().entrySet()) { + for (final Entry keyValue : ((NodeIdentifierWithPredicates) currentArg).entrySet()) { builder.addChild(Builders.leafBuilder() // .withNodeIdentifier(new NodeIdentifier(keyValue.getKey())).withValue(keyValue.getValue()) @@ -233,43 +239,41 @@ public abstract class DataNormalizationOperation impleme return builder.build(); } - @Override public boolean isKeyedEntry() { return true; } } - private static final class UnkeyedListItemNormalization extends DataContainerNormalizationOperation { - - protected UnkeyedListItemNormalization(final ListSchemaNode schema) { + private static final class UnkeyedListItemNormalization + extends DataContainerNormalizationOperation { + UnkeyedListItemNormalization(final ListSchemaNode schema) { super(new NodeIdentifier(schema.getQName()), schema,schema); } @Override + @SuppressFBWarnings("BC_UNCONFIRMED_CAST") public NormalizedNode createDefault(final PathArgument currentArg) { return Builders.unkeyedListEntryBuilder().withNodeIdentifier((NodeIdentifier) currentArg).build(); } - } private static final class ContainerNormalization extends DataContainerNormalizationOperation { - - protected ContainerNormalization(final ContainerSchemaNode schema) { + ContainerNormalization(final ContainerSchemaNode schema) { super(new NodeIdentifier(schema.getQName()),schema, schema); } @Override + @SuppressFBWarnings("BC_UNCONFIRMED_CAST") public NormalizedNode createDefault(final PathArgument currentArg) { return Builders.containerBuilder().withNodeIdentifier((NodeIdentifier) currentArg).build(); } - } - private static abstract class MixinNormalizationOp extends - CompositeNodeNormalizationOperation { + private abstract static class MixinNormalizationOp + extends CompositeNodeNormalizationOperation { - protected MixinNormalizationOp(final T identifier, final DataSchemaNode schema) { + MixinNormalizationOp(final T identifier, final DataSchemaNode schema) { super(identifier,schema); } @@ -277,14 +281,10 @@ public abstract class DataNormalizationOperation impleme public final boolean isMixin() { return true; } - } - private static final class OrderedLeafListMixinNormalization extends UnorderedLeafListMixinNormalization { - - - public OrderedLeafListMixinNormalization(final LeafListSchemaNode potential) { + OrderedLeafListMixinNormalization(final LeafListSchemaNode potential) { super(potential); } @@ -298,10 +298,11 @@ public abstract class DataNormalizationOperation impleme private final DataNormalizationOperation innerOp; - public UnorderedLeafListMixinNormalization(final LeafListSchemaNode potential) { + UnorderedLeafListMixinNormalization(final LeafListSchemaNode potential) { super(new NodeIdentifier(potential.getQName()),potential); innerOp = new LeafListEntryNormalization(potential); } + @Override public NormalizedNode createDefault(final PathArgument currentArg) { return Builders.leafSetBuilder().withNodeIdentifier(getIdentifier()).build(); @@ -324,31 +325,37 @@ public abstract class DataNormalizationOperation impleme } } - private static final class AugmentationNormalization extends DataContainerNormalizationOperation { + private static final class AugmentationNormalization + extends DataContainerNormalizationOperation { - public AugmentationNormalization(final AugmentationSchema augmentation, final DataNodeContainer schema) { - //super(); + AugmentationNormalization(final AugmentationSchemaNode augmentation, final DataNodeContainer schema) { super(augmentationIdentifierFrom(augmentation), augmentationProxy(augmentation,schema),null); } + private static DataNodeContainer augmentationProxy(final AugmentationSchemaNode augmentation, + final DataNodeContainer schema) { + final Set children = new HashSet<>(); + for (final DataSchemaNode augNode : augmentation.getChildNodes()) { + children.add(schema.getDataChildByName(augNode.getQName())); + } + return new EffectiveAugmentationSchema(augmentation, children); + } + @Override public boolean isMixin() { return true; } - - @Override - protected DataNormalizationOperation fromLocalSchemaAndQName(final DataNodeContainer schema, final QName child) - throws DataNormalizationException { - Optional potential = findChildSchemaNode(schema, child); - if (!potential.isPresent()) { + protected DataNormalizationOperation fromLocalSchemaAndQName(final DataNodeContainer schema, + final QName child) { + final DataSchemaNode result = findChildSchemaNode(schema, child); + if (result == null) { return null; } - DataSchemaNode result = potential.get(); // We try to look up if this node was added by augmentation - if ((schema instanceof DataSchemaNode) && result.isAugmenting()) { + if (schema instanceof DataSchemaNode && result.isAugmenting()) { return fromAugmentation(schema, (AugmentationTarget) schema, result); } return fromDataSchemaNode(result); @@ -363,17 +370,15 @@ public abstract class DataNormalizationOperation impleme public NormalizedNode createDefault(final PathArgument currentArg) { return Builders.augmentationBuilder().withNodeIdentifier(getIdentifier()).build(); } - } private static class UnorderedMapMixinNormalization extends MixinNormalizationOp { - private final ListItemNormalization innerNode; - public UnorderedMapMixinNormalization(final ListSchemaNode list) { + UnorderedMapMixinNormalization(final ListSchemaNode list) { super(new NodeIdentifier(list.getQName()),list); - this.innerNode = new ListItemNormalization(new NodeIdentifierWithPredicates(list.getQName(), - Collections. emptyMap()), list); + this.innerNode = new ListItemNormalization(NodeIdentifierWithPredicates.of(list.getQName(), + Collections.emptyMap()), list); } @Override @@ -396,15 +401,12 @@ public abstract class DataNormalizationOperation impleme } return null; } - } - private static class UnkeyedListMixinNormalization extends MixinNormalizationOp { - private final UnkeyedListItemNormalization innerNode; - public UnkeyedListMixinNormalization(final ListSchemaNode list) { + UnkeyedListMixinNormalization(final ListSchemaNode list) { super(new NodeIdentifier(list.getQName()),list); this.innerNode = new UnkeyedListItemNormalization(list); } @@ -429,12 +431,10 @@ public abstract class DataNormalizationOperation impleme } return null; } - } private static final class OrderedMapMixinNormalization extends UnorderedMapMixinNormalization { - - public OrderedMapMixinNormalization(final ListSchemaNode list) { + OrderedMapMixinNormalization(final ListSchemaNode list) { super(list); } @@ -442,24 +442,23 @@ public abstract class DataNormalizationOperation impleme public NormalizedNode createDefault(final PathArgument currentArg) { return Builders.orderedMapBuilder().withNodeIdentifier(getIdentifier()).build(); } - } private static class ChoiceNodeNormalization extends MixinNormalizationOp { - private final ImmutableMap> byQName; private final ImmutableMap> byArg; - protected ChoiceNodeNormalization(final ChoiceSchemaNode schema) { + ChoiceNodeNormalization(final ChoiceSchemaNode schema) { super(new NodeIdentifier(schema.getQName()),schema); - ImmutableMap.Builder> byQNameBuilder = ImmutableMap.builder(); - ImmutableMap.Builder> byArgBuilder = ImmutableMap.builder(); + final ImmutableMap.Builder> byQNameBuilder = ImmutableMap.builder(); + final ImmutableMap.Builder> byArgBuilder = + ImmutableMap.builder(); - for (ChoiceCaseNode caze : schema.getCases()) { - for (DataSchemaNode cazeChild : caze.getChildNodes()) { - DataNormalizationOperation childOp = fromDataSchemaNode(cazeChild); + for (final CaseSchemaNode caze : schema.getCases().values()) { + for (final DataSchemaNode cazeChild : caze.getChildNodes()) { + final DataNormalizationOperation childOp = fromDataSchemaNode(cazeChild); byArgBuilder.put(childOp.getIdentifier(), childOp); - for (QName qname : childOp.getQNameIdentifiers()) { + for (final QName qname : childOp.getQNameIdentifiers()) { byQNameBuilder.put(qname, childOp); } } @@ -485,18 +484,17 @@ public abstract class DataNormalizationOperation impleme } private static class AnyXmlNormalization extends DataNormalizationOperation { - - protected AnyXmlNormalization( final AnyXmlSchemaNode schema) { - super( new NodeIdentifier(schema.getQName()), schema); + AnyXmlNormalization(final AnyXmlSchemaNode schema) { + super(new NodeIdentifier(schema.getQName()), schema); } @Override - public DataNormalizationOperation getChild( final PathArgument child ) throws DataNormalizationException { + public DataNormalizationOperation getChild(final PathArgument child) { return null; } @Override - public DataNormalizationOperation getChild( final QName child ) throws DataNormalizationException { + public DataNormalizationOperation getChild(final QName child) { return null; } @@ -506,84 +504,51 @@ public abstract class DataNormalizationOperation impleme } @Override - public NormalizedNode createDefault( final PathArgument currentArg ) { + public NormalizedNode createDefault(final PathArgument currentArg) { return null; } } - private static final Optional findChildSchemaNode(final DataNodeContainer parent,final QName child) { - DataSchemaNode potential = parent.getDataChildByName(child); - if (potential == null) { - Iterable choices = FluentIterable.from(parent.getChildNodes()).filter(ChoiceSchemaNode.class); - potential = findChoice(choices, child); - } - return Optional.fromNullable(potential); - } - - private static DataNormalizationOperation fromSchemaAndQNameChecked(final DataNodeContainer schema, - final QName child) throws DataNormalizationException { - - Optional potential = findChildSchemaNode(schema, child); - if (!potential.isPresent()) { - throw new DataNormalizationException(String.format("Supplied QName %s is not valid according to schema %s, potential children nodes: %s", child, schema,schema.getChildNodes())); - } - - DataSchemaNode result = potential.get(); - // We try to look up if this node was added by augmentation - if ((schema instanceof DataSchemaNode) && result.isAugmenting()) { - return fromAugmentation(schema, (AugmentationTarget) schema, result); - } - return fromDataSchemaNode(result); + private static @Nullable DataSchemaNode findChildSchemaNode(final DataNodeContainer parent, final QName child) { + final DataSchemaNode potential = parent.getDataChildByName(child); + return potential != null ? potential : findChoice(parent, child); } - private static ChoiceSchemaNode findChoice(final Iterable choices, final QName child) { - ChoiceSchemaNode foundChoice = null; - choiceLoop: for (ChoiceSchemaNode choice : choices) { - for (ChoiceCaseNode caze : choice.getCases()) { - if (findChildSchemaNode(caze, child).isPresent()) { - foundChoice = choice; - break choiceLoop; + private static @Nullable ChoiceSchemaNode findChoice(final DataNodeContainer parent, final QName child) { + for (final ChoiceSchemaNode choice : Iterables.filter(parent.getChildNodes(), ChoiceSchemaNode.class)) { + for (final CaseSchemaNode caze : choice.getCases().values()) { + if (findChildSchemaNode(caze, child) != null) { + return choice; } } } - return foundChoice; + return null; } - public static AugmentationIdentifier augmentationIdentifierFrom(final AugmentationSchema augmentation) { - ImmutableSet.Builder potentialChildren = ImmutableSet.builder(); - for (DataSchemaNode child : augmentation.getChildNodes()) { + public static AugmentationIdentifier augmentationIdentifierFrom(final AugmentationSchemaNode augmentation) { + final ImmutableSet.Builder potentialChildren = ImmutableSet.builder(); + for (final DataSchemaNode child : augmentation.getChildNodes()) { potentialChildren.add(child.getQName()); } return new AugmentationIdentifier(potentialChildren.build()); } - private static DataNodeContainer augmentationProxy(final AugmentationSchema augmentation, final DataNodeContainer schema) { - Set children = new HashSet<>(); - for (DataSchemaNode augNode : augmentation.getChildNodes()) { - children.add(schema.getDataChildByName(augNode.getQName())); - } - return new DataSchemaContainerProxy(children); - } - /** - * Returns a DataNormalizationOperation for provided child node + * Returns a DataNormalizationOperation for provided child node. * + *

* If supplied child is added by Augmentation this operation returns * a DataNormalizationOperation for augmentation, * otherwise returns a DataNormalizationOperation for child as * call for {@link #fromDataSchemaNode(DataSchemaNode)}. - * - * - * @param parent - * @param parentAug - * @param child - * @return */ + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private static DataNormalizationOperation fromAugmentation(final DataNodeContainer parent, final AugmentationTarget parentAug, final DataSchemaNode child) { - AugmentationSchema augmentation = null; - for (AugmentationSchema aug : parentAug.getAvailableAugmentations()) { - DataSchemaNode potential = aug.getDataChildByName(child.getQName()); + AugmentationSchemaNode augmentation = null; + for (final AugmentationSchemaNode aug : parentAug.getAvailableAugmentations()) { + final DataSchemaNode potential = aug.getDataChildByName(child.getQName()); if (potential != null) { augmentation = aug; break; @@ -610,24 +575,24 @@ public abstract class DataNormalizationOperation impleme } else if (potential instanceof LeafListSchemaNode) { return fromLeafListSchemaNode((LeafListSchemaNode) potential); } else if (potential instanceof AnyXmlSchemaNode) { - return new AnyXmlNormalization( (AnyXmlSchemaNode) potential); + return new AnyXmlNormalization((AnyXmlSchemaNode) potential); } return null; } private static DataNormalizationOperation fromListSchemaNode(final ListSchemaNode potential) { - List keyDefinition = potential.getKeyDefinition(); - if(keyDefinition == null || keyDefinition.isEmpty()) { + final List keyDefinition = potential.getKeyDefinition(); + if (keyDefinition == null || keyDefinition.isEmpty()) { return new UnkeyedListMixinNormalization(potential); } - if(potential.isUserOrdered()) { + if (potential.isUserOrdered()) { return new OrderedMapMixinNormalization(potential); } return new UnorderedMapMixinNormalization(potential); } private static DataNormalizationOperation fromLeafListSchemaNode(final LeafListSchemaNode potential) { - if(potential.isUserOrdered()) { + if (potential.isUserOrdered()) { return new OrderedLeafListMixinNormalization(potential); } return new UnorderedLeafListMixinNormalization(potential);