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=b727e5317b087cb7784cb83be78e596dc397698e;hb=0b283e62a5872be1960635d5d6c4d301b1f87df2;hpb=608760751ce7fcf4e84e86a8b33d43bc1d9984d6 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 b727e5317b..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,167 +7,61 @@ */ package org.opendaylight.controller.md.sal.binding.impl; -import com.google.common.base.Function; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableBiMap; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.lang.reflect.Method; -import java.util.AbstractMap.SimpleEntry; import java.util.Iterator; import java.util.Map; -import java.util.Map.Entry; -import javax.annotation.Nonnull; 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.api.BindingCodecTree; -import org.opendaylight.yangtools.binding.data.codec.api.BindingCodecTreeFactory; -import org.opendaylight.yangtools.binding.data.codec.api.BindingCodecTreeNode; -import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer; -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.yangtools.yang.binding.BindingMapping; -import org.opendaylight.yangtools.yang.binding.DataContainer; +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.Notification; import org.opendaylight.yangtools.yang.binding.RpcService; -import org.opendaylight.yangtools.yang.binding.util.BindingReflections; -import org.opendaylight.yangtools.yang.common.QNameModule; 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.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.impl.codec.DeserializationException; -import org.opendaylight.yangtools.yang.model.api.Module; 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.opendaylight.yangtools.yang.model.api.SchemaPath; -public class BindingToNormalizedNodeCodec implements BindingCodecTreeFactory, BindingNormalizedNodeSerializer, 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 final BindingNormalizedNodeCodecRegistry codecRegistry; - private DataNormalizer legacyToNormalized; - private final GeneratedClassLoadingStrategy classLoadingStrategy; - private BindingRuntimeContext runtimeContext; + private DataNormalizer legacyToNormalized = null; - public BindingToNormalizedNodeCodec(final GeneratedClassLoadingStrategy classLoadingStrategy, + public BindingToNormalizedNodeCodec(final ClassLoadingStrategy classLoadingStrategy, final BindingNormalizedNodeCodecRegistry codecRegistry) { - this.classLoadingStrategy = classLoadingStrategy; - this.codecRegistry = codecRegistry; - - } - - public YangInstanceIdentifier toNormalized(final InstanceIdentifier binding) { - return codecRegistry.toYangInstanceIdentifier(binding); - } - - @Override - public YangInstanceIdentifier toYangInstanceIdentifier(final InstanceIdentifier binding) { - return codecRegistry.toYangInstanceIdentifier(binding); - } - - @Override - public Entry> toNormalizedNode( - final InstanceIdentifier path, final T data) { - return codecRegistry.toNormalizedNode(path, data); + super(classLoadingStrategy, codecRegistry); } - @SuppressWarnings({"unchecked", "rawtypes"}) - public Entry> toNormalizedNode( - final Entry, DataObject> binding) { - return toNormalizedNode((InstanceIdentifier) binding.getKey(),binding.getValue()); + public BindingToNormalizedNodeCodec(final ClassLoadingStrategy classLoadingStrategy, + final BindingNormalizedNodeCodecRegistry codecRegistry, final boolean waitForSchema) { + super(classLoadingStrategy, codecRegistry, waitForSchema); } - @Override - public Entry, DataObject> fromNormalizedNode(final YangInstanceIdentifier path, - final NormalizedNode data) { - return codecRegistry.fromNormalizedNode(path, data); + DataNormalizer getDataNormalizer() { + return this.legacyToNormalized; } @Override - public Notification fromNormalizedNodeNotification(final SchemaPath path, final ContainerNode data) { - return codecRegistry.fromNormalizedNodeNotification(path, data); + public YangInstanceIdentifier toYangInstanceIdentifierBlocking( + final InstanceIdentifier binding) { + return super.toYangInstanceIdentifierBlocking(binding); } @Override - public DataObject fromNormalizedNodeRpcData(final SchemaPath path, final ContainerNode data) { - return codecRegistry.fromNormalizedNodeRpcData(path, data); + public YangInstanceIdentifier toYangInstanceIdentifierCached(final InstanceIdentifier binding) { + return super.toYangInstanceIdentifierCached(binding); } @Override - public InstanceIdentifier fromYangInstanceIdentifier(final YangInstanceIdentifier dom) { - return codecRegistry.fromYangInstanceIdentifier(dom); - } - - @Override - public ContainerNode toNormalizedNodeNotification(final Notification data) { - return codecRegistry.toNormalizedNodeNotification(data); - } - - @Override - public ContainerNode toNormalizedNodeRpcData(final DataContainer data) { - return codecRegistry.toNormalizedNodeRpcData(data); - } - - /** - * - * 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 YangInstanceIdentifier normalized) - throws DeserializationException { - try { - return Optional.>fromNullable(codecRegistry.fromYangInstanceIdentifier(normalized)); - } catch (final IllegalArgumentException e) { - return Optional.absent(); - } - } - - public DataNormalizer getDataNormalizer() { - return legacyToNormalized; - } - - public Optional, DataObject>> toBinding( - final @Nonnull Entry> normalized) - throws DeserializationException { - try { - /* - * This cast is required, due to generics behaviour in openjdk / oracle javac - * - * InstanceIdentifier has definition InstanceIdentifier, - * this means '?' is always  . Eclipse compiler - * is able to determine this relationship and treats - * Entry,DataObject> and Entry - * as assignable. However openjdk / oracle javac treats this two types - * as incompatible and issues a compile error. - * - * It is safe to loose generic information and cast it to other generic signature. - * - */ - @SuppressWarnings({ "unchecked", "rawtypes" }) - final Entry, DataObject> binding = Entry.class.cast(codecRegistry.fromNormalizedNode(normalized.getKey(), normalized.getValue())); - return Optional.fromNullable(binding); - } catch (final IllegalArgumentException e) { - return Optional.absent(); - } - } - - @Override - public void onGlobalContextUpdated(final SchemaContext arg0) { - legacyToNormalized = new DataNormalizer (arg0); - runtimeContext = BindingRuntimeContext.create(classLoadingStrategy, arg0); - codecRegistry.onBindingRuntimeContextUpdated(runtimeContext); - } - - public Function>, Optional> deserializeFunction(final InstanceIdentifier path) { - return codecRegistry.deserializeFunction(path); + public void onGlobalContextUpdated(final SchemaContext schemaContext) { + this.legacyToNormalized = new DataNormalizer(schemaContext); + super.onGlobalContextUpdated(schemaContext); } /** @@ -176,9 +70,10 @@ public class BindingToNormalizedNodeCodec implements BindingCodecTreeFactory, Bi * @param path DOM Path * @return Node with defaults set on. */ + @Override public NormalizedNode getDefaultNodeFor(final YangInstanceIdentifier path) { final Iterator iterator = path.getPathArguments().iterator(); - DataNormalizationOperation currentOp = legacyToNormalized.getRootOperation(); + DataNormalizationOperation currentOp = this.legacyToNormalized.getRootOperation(); while (iterator.hasNext()) { final PathArgument currentArg = iterator.next(); try { @@ -190,66 +85,14 @@ public class BindingToNormalizedNodeCodec implements BindingCodecTreeFactory, Bi return currentOp.createDefault(path.getLastPathArgument()); } - public BindingNormalizedNodeCodecRegistry getCodecRegistry() { - return codecRegistry; - } - - @Override - public void close() { - // NOOP Intentionally - } - - public BindingNormalizedNodeCodecRegistry getCodecFactory() { - return codecRegistry; - } - - // FIXME: This should be probably part of Binding Runtime context - public ImmutableBiMap getRpcMethodToSchemaPath(final Class key) { - final QNameModule moduleName = BindingReflections.getQNameModule(key); - final Module module = runtimeContext.getSchemaContext().findModuleByNamespaceAndRevision(moduleName.getNamespace(), moduleName.getRevision()); - final ImmutableBiMap.Builder ret = ImmutableBiMap.builder(); - try { - for (final RpcDefinition rpcDef : module.getRpcs()) { - final Method method = findRpcMethod(key, rpcDef); - ret.put(method, rpcDef.getPath()); - } - } catch (final NoSuchMethodException e) { - throw new IllegalStateException("Rpc defined in model does not have representation in generated class.", e); - } - return ret.build(); - } - - private Method findRpcMethod(final Class key, final RpcDefinition rpcDef) throws NoSuchMethodException { - final String methodName = BindingMapping.getMethodName(rpcDef.getQName()); - if(rpcDef.getInput() != null) { - final Class inputClz = runtimeContext.getClassForSchema(rpcDef.getInput()); - return key.getMethod(methodName, inputClz); - } - return key.getMethod(methodName); - } - @Override - public BindingCodecTree create(final BindingRuntimeContext context) { - return codecRegistry.create(context); + public ImmutableBiMap getRpcMethodToSchema(final Class key) { + return super.getRpcMethodToSchema(key); } @Override - public BindingCodecTree create(final SchemaContext context, final Class... bindingClasses) { - return codecRegistry.create(context, bindingClasses); - } - - @Nonnull protected Map.Entry, BindingCodecTreeNode> getSubtreeCodec( + public Map.Entry, BindingDataObjectCodecTreeNode> getSubtreeCodec( final YangInstanceIdentifier domIdentifier) { - - final BindingCodecTree currentCodecTree = codecRegistry.getCodecContext(); - final InstanceIdentifier bindingPath = codecRegistry.fromYangInstanceIdentifier(domIdentifier); - Preconditions.checkArgument(bindingPath != null); - /** - * If we are able to deserialize YANG instance identifier, getSubtreeCodec must - * return non-null value. - */ - final BindingCodecTreeNode codecContext = currentCodecTree.getSubtreeCodec(bindingPath); - return new SimpleEntry, BindingCodecTreeNode>(bindingPath, codecContext); + return super.getSubtreeCodec(domIdentifier); } - }