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=87e97d460677cb479fb249a6d2b72de5723b15e8;hp=4174fac41cda9a6e6e0edfc12617f37746aaae37;hb=refs%2Fchanges%2F29%2F83829%2F3;hpb=db26fc0bc09a9e2c1190f03b159c87355d20bf8e 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 4174fac41c..87e97d4606 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 @@ -11,6 +11,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 edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -28,7 +29,7 @@ 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.AugmentationSchemaNode; import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; @@ -81,7 +82,6 @@ public abstract class DataNormalizationOperation impleme public abstract DataNormalizationOperation getChild(QName child) throws DataNormalizationException; - public abstract boolean isLeaf(); public Optional getDataSchemaNode() { @@ -91,8 +91,7 @@ public abstract class DataNormalizationOperation impleme private abstract static class SimpleTypeNormalization extends DataNormalizationOperation { - - protected SimpleTypeNormalization(final T identifier, final DataSchemaNode potential) { + SimpleTypeNormalization(final T identifier, final DataSchemaNode potential) { super(identifier,potential); } @@ -118,15 +117,12 @@ public abstract class DataNormalizationOperation impleme } 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 { - LeafListEntryNormalization(final LeafListSchemaNode potential) { super(new NodeWithValue(potential.getQName(), null),potential); } @@ -139,8 +135,7 @@ public abstract class DataNormalizationOperation impleme private abstract static class CompositeNodeNormalizationOperation extends DataNormalizationOperation { - - protected CompositeNodeNormalizationOperation(final T identifier, final DataSchemaNode schema) { + CompositeNodeNormalizationOperation(final T identifier, final DataSchemaNode schema) { super(identifier,schema); } @@ -148,18 +143,15 @@ public abstract class DataNormalizationOperation impleme public boolean isLeaf() { return false; } - - } 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, + DataContainerNormalizationOperation(final T identifier, final DataNodeContainer schema, final DataSchemaNode node) { super(identifier,node); this.schema = schema; @@ -210,22 +202,20 @@ public abstract class DataNormalizationOperation impleme } return potential; } - } private static final class ListItemNormalization extends DataContainerNormalizationOperation { - - protected ListItemNormalization(final NodeIdentifierWithPredicates identifier, final ListSchemaNode schema) { + ListItemNormalization(final NodeIdentifierWithPredicates identifier, final ListSchemaNode schema) { super(identifier, schema, schema); } @Override + @SuppressFBWarnings("BC_UNCONFIRMED_CAST") public NormalizedNode createDefault(final PathArgument currentArg) { - final DataContainerNodeAttrBuilder builder = Builders + final DataContainerNodeBuilder builder = Builders .mapEntryBuilder().withNodeIdentifier((NodeIdentifierWithPredicates) currentArg); - for (final 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()) @@ -234,7 +224,6 @@ public abstract class DataNormalizationOperation impleme return builder.build(); } - @Override public boolean isKeyedEntry() { return true; @@ -243,35 +232,33 @@ public abstract class DataNormalizationOperation impleme private static final class UnkeyedListItemNormalization extends DataContainerNormalizationOperation { - - protected UnkeyedListItemNormalization(final ListSchemaNode schema) { + 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 abstract static class MixinNormalizationOp extends CompositeNodeNormalizationOperation { - protected MixinNormalizationOp(final T identifier, final DataSchemaNode schema) { + MixinNormalizationOp(final T identifier, final DataSchemaNode schema) { super(identifier,schema); } @@ -279,10 +266,8 @@ public abstract class DataNormalizationOperation impleme public final boolean isMixin() { return true; } - } - private static final class OrderedLeafListMixinNormalization extends UnorderedLeafListMixinNormalization { OrderedLeafListMixinNormalization(final LeafListSchemaNode potential) { super(potential); @@ -337,11 +322,9 @@ public abstract class DataNormalizationOperation impleme return true; } - - @Override protected DataNormalizationOperation fromLocalSchemaAndQName(final DataNodeContainer schema, - final QName child) throws DataNormalizationException { + final QName child) { final Optional potential = findChildSchemaNode(schema, child); if (!potential.isPresent()) { return null; @@ -368,12 +351,11 @@ public abstract class DataNormalizationOperation impleme } private static class UnorderedMapMixinNormalization extends MixinNormalizationOp { - private final ListItemNormalization innerNode; UnorderedMapMixinNormalization(final ListSchemaNode list) { super(new NodeIdentifier(list.getQName()),list); - this.innerNode = new ListItemNormalization(new NodeIdentifierWithPredicates(list.getQName(), + this.innerNode = new ListItemNormalization(NodeIdentifierWithPredicates.of(list.getQName(), Collections.emptyMap()), list); } @@ -397,12 +379,9 @@ public abstract class DataNormalizationOperation impleme } return null; } - } - private static class UnkeyedListMixinNormalization extends MixinNormalizationOp { - private final UnkeyedListItemNormalization innerNode; UnkeyedListMixinNormalization(final ListSchemaNode list) { @@ -430,11 +409,9 @@ public abstract class DataNormalizationOperation impleme } return null; } - } private static final class OrderedMapMixinNormalization extends UnorderedMapMixinNormalization { - OrderedMapMixinNormalization(final ListSchemaNode list) { super(list); } @@ -443,15 +420,13 @@ 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); final ImmutableMap.Builder> byQNameBuilder = ImmutableMap.builder(); final ImmutableMap.Builder> byArgBuilder = @@ -487,18 +462,17 @@ public abstract class DataNormalizationOperation impleme } private static class AnyXmlNormalization extends DataNormalizationOperation { - - protected AnyXmlNormalization(final AnyXmlSchemaNode 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; }