X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fimpl%2FBindingToNormalizedNodeCodec.java;h=f5a1435b7f77292df7e1b6736302452d70932134;hp=1e2d2b17f0b1846ab9272f6683f2a0f00cd1c070;hb=0b283e62a5872be1960635d5d6c4d301b1f87df2;hpb=1d913b4ae95e8ce80645dd96df5b28750c3053e2 diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java index 1e2d2b17f0..f5a1435b7f 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java @@ -7,114 +7,61 @@ */ package org.opendaylight.controller.md.sal.binding.impl; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import java.util.AbstractMap.SimpleEntry; +import com.google.common.collect.ImmutableBiMap; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import java.lang.reflect.Method; import java.util.Iterator; -import java.util.Map.Entry; +import java.util.Map; import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizationException; import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizationOperation; import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizer; -import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry; -import org.opendaylight.yangtools.sal.binding.generator.impl.GeneratedClassLoadingStrategy; -import org.opendaylight.yangtools.sal.binding.generator.util.BindingRuntimeContext; +import org.opendaylight.mdsal.binding.dom.codec.api.BindingDataObjectCodecTreeNode; +import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry; +import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.RpcService; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService; -import org.opendaylight.yangtools.yang.data.impl.codec.DeserializationException; +import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaContextListener; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -public class BindingToNormalizedNodeCodec implements SchemaContextListener,AutoCloseable { +@SuppressFBWarnings(value = "NM_SAME_SIMPLE_NAME_AS_SUPERCLASS", justification = "Migration path") +public class BindingToNormalizedNodeCodec + extends org.opendaylight.mdsal.binding.dom.adapter.BindingToNormalizedNodeCodec { - private static final Logger LOG = LoggerFactory.getLogger(BindingToNormalizedNodeCodec.class); - - private final BindingIndependentMappingService bindingToLegacy; - private final BindingNormalizedNodeCodecRegistry codecRegistry; - private DataNormalizer legacyToNormalized; - private final GeneratedClassLoadingStrategy classLoadingStrategy; - - public BindingToNormalizedNodeCodec(final GeneratedClassLoadingStrategy classLoadingStrategy, final BindingIndependentMappingService mappingService, final BindingNormalizedNodeCodecRegistry codecRegistry) { - super(); - this.bindingToLegacy = mappingService; - this.classLoadingStrategy = classLoadingStrategy; - this.codecRegistry = codecRegistry; + private DataNormalizer legacyToNormalized = null; + public BindingToNormalizedNodeCodec(final ClassLoadingStrategy classLoadingStrategy, + final BindingNormalizedNodeCodecRegistry codecRegistry) { + super(classLoadingStrategy, codecRegistry); } - public org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier toNormalized( - final InstanceIdentifier binding) { - return codecRegistry.toYangInstanceIdentifier(binding); + public BindingToNormalizedNodeCodec(final ClassLoadingStrategy classLoadingStrategy, + final BindingNormalizedNodeCodecRegistry codecRegistry, final boolean waitForSchema) { + super(classLoadingStrategy, codecRegistry, waitForSchema); } - @SuppressWarnings({ "unchecked", "rawtypes" }) - public Entry> toNormalizedNode( - final InstanceIdentifier bindingPath, final DataObject bindingObject) { - return codecRegistry.toNormalizedNode((InstanceIdentifier) bindingPath, bindingObject); - + DataNormalizer getDataNormalizer() { + return this.legacyToNormalized; } - public Entry> toNormalizedNode( - final Entry, DataObject> binding) { - return toNormalizedNode(binding.getKey(),binding.getValue()); - } - - /** - * - * Returns a Binding-Aware instance identifier from normalized - * instance-identifier if it is possible to create representation. - * - * Returns Optional.absent for cases where target is mixin node except - * augmentation. - * - */ - public Optional> toBinding( - final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier normalized) - throws DeserializationException { - try { - return Optional.>of(codecRegistry.fromYangInstanceIdentifier(normalized)); - } catch (IllegalArgumentException e) { - return Optional.absent(); - } - } - - - private static final Entry, DataObject> toBindingEntry( - final org.opendaylight.yangtools.yang.binding.InstanceIdentifier key, - final DataObject value) { - return new SimpleEntry, DataObject>( - key, value); - } - - public DataNormalizer getDataNormalizer() { - return legacyToNormalized; - } - - @SuppressWarnings("unchecked") - public Optional, DataObject>> toBinding( - final Entry> normalized) - throws DeserializationException { - try { - @SuppressWarnings("rawtypes") - Entry binding = codecRegistry.fromNormalizedNode(normalized.getKey(), normalized.getValue()); - return Optional., DataObject>>fromNullable(binding); - } catch (IllegalArgumentException e) { - return Optional.absent(); - } + @Override + public YangInstanceIdentifier toYangInstanceIdentifierBlocking( + final InstanceIdentifier binding) { + return super.toYangInstanceIdentifierBlocking(binding); } @Override - public void onGlobalContextUpdated(final SchemaContext arg0) { - legacyToNormalized = new DataNormalizer(arg0); - codecRegistry.onBindingRuntimeContextUpdated(BindingRuntimeContext.create(classLoadingStrategy, arg0)); + public YangInstanceIdentifier toYangInstanceIdentifierCached(final InstanceIdentifier binding) { + return super.toYangInstanceIdentifierCached(binding); } - public Function>, Optional> deserializeFunction(final InstanceIdentifier path) { - return codecRegistry.deserializeFunction(path); + @Override + public void onGlobalContextUpdated(final SchemaContext schemaContext) { + this.legacyToNormalized = new DataNormalizer(schemaContext); + super.onGlobalContextUpdated(schemaContext); } /** @@ -123,26 +70,29 @@ public class BindingToNormalizedNodeCodec implements SchemaContextListener,AutoC * @param path DOM Path * @return Node with defaults set on. */ - public NormalizedNode getDefaultNodeFor(final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier path) { - Iterator iterator = path.getPathArguments().iterator(); - DataNormalizationOperation currentOp = legacyToNormalized.getRootOperation(); + @Override + public NormalizedNode getDefaultNodeFor(final YangInstanceIdentifier path) { + final Iterator iterator = path.getPathArguments().iterator(); + DataNormalizationOperation currentOp = this.legacyToNormalized.getRootOperation(); while (iterator.hasNext()) { - PathArgument currentArg = iterator.next(); + final PathArgument currentArg = iterator.next(); try { currentOp = currentOp.getChild(currentArg); - } catch (DataNormalizationException e) { + } catch (final DataNormalizationException e) { throw new IllegalArgumentException(String.format("Invalid child encountered in path %s", path), e); } } return currentOp.createDefault(path.getLastPathArgument()); } - public BindingIndependentMappingService getLegacy() { - return bindingToLegacy; + @Override + public ImmutableBiMap getRpcMethodToSchema(final Class key) { + return super.getRpcMethodToSchema(key); } @Override - public void close() throws Exception { - // NOOP Intentionally + public Map.Entry, BindingDataObjectCodecTreeNode> getSubtreeCodec( + final YangInstanceIdentifier domIdentifier) { + return super.getSubtreeCodec(domIdentifier); } }