From f482d8928cc9954d33020b109f3b6854e37212db Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Mon, 30 Mar 2015 16:51:19 +0200 Subject: [PATCH] Export BindingNormalizedNodeSerializer via Config Subsystem. Change-Id: I2cabdc89b01739ef2ffdbedeff9b11038e0fa41f Signed-off-by: Tony Tkacik --- .../src/main/resources/initial/01-md-sal.xml | 7 +++ .../impl/BindingToNormalizedNodeCodec.java | 52 ++++++++++++++++--- .../opendaylight-binding-broker-impl.yang | 1 + .../yang/opendaylight-md-sal-binding.yang | 5 ++ 4 files changed, 59 insertions(+), 6 deletions(-) diff --git a/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml b/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml index 5ef6a245ec..71c4850748 100644 --- a/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml +++ b/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml @@ -226,6 +226,13 @@ /modules/module[type='runtime-generated-mapping'][name='runtime-mapping-singleton'] + + binding:binding-normalized-node-serializer + + runtime-mapping-singleton + /modules/module[type='runtime-generated-mapping'][name='runtime-mapping-singleton'] + + binding-impl:binding-new-notification-service 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 270ae50475..d9e58e538d 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 @@ -19,17 +19,21 @@ import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizat 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.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.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; @@ -38,7 +42,7 @@ 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, SchemaContextListener, AutoCloseable { +public class BindingToNormalizedNodeCodec implements BindingCodecTreeFactory, BindingNormalizedNodeSerializer, SchemaContextListener, AutoCloseable { private final BindingNormalizedNodeCodecRegistry codecRegistry; private DataNormalizer legacyToNormalized; @@ -56,16 +60,52 @@ public class BindingToNormalizedNodeCodec implements BindingCodecTreeFactory, Sc return codecRegistry.toYangInstanceIdentifier(binding); } - @SuppressWarnings({ "unchecked", "rawtypes" }) - public Entry> toNormalizedNode( - final InstanceIdentifier bindingPath, final DataObject bindingObject) { - return codecRegistry.toNormalizedNode((InstanceIdentifier) bindingPath, bindingObject); + @Override + public YangInstanceIdentifier toYangInstanceIdentifier(InstanceIdentifier binding) { + return codecRegistry.toYangInstanceIdentifier(binding); + } + @Override + public Entry> toNormalizedNode( + InstanceIdentifier path, T data) { + return codecRegistry.toNormalizedNode(path, data); } + @SuppressWarnings({"unchecked", "rawtypes"}) public Entry> toNormalizedNode( final Entry, DataObject> binding) { - return toNormalizedNode(binding.getKey(),binding.getValue()); + return toNormalizedNode((InstanceIdentifier) binding.getKey(),binding.getValue()); + } + + @Override + public Entry, DataObject> fromNormalizedNode(YangInstanceIdentifier path, + NormalizedNode data) { + return codecRegistry.fromNormalizedNode(path, data); + } + + @Override + public Notification fromNormalizedNodeNotification(SchemaPath path, ContainerNode data) { + return codecRegistry.fromNormalizedNodeNotification(path, data); + } + + @Override + public DataObject fromNormalizedNodeRpcData(SchemaPath path, ContainerNode data) { + return codecRegistry.fromNormalizedNodeRpcData(path, data); + } + + @Override + public InstanceIdentifier fromYangInstanceIdentifier(YangInstanceIdentifier dom) { + return codecRegistry.fromYangInstanceIdentifier(dom); + } + + @Override + public ContainerNode toNormalizedNodeNotification(Notification data) { + return codecRegistry.toNormalizedNodeNotification(data); + } + + @Override + public ContainerNode toNormalizedNodeRpcData(DataContainer data) { + return codecRegistry.toNormalizedNodeRpcData(data); } /** diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/yang/opendaylight-binding-broker-impl.yang b/opendaylight/md-sal/sal-binding-broker/src/main/yang/opendaylight-binding-broker-impl.yang index e15cb83385..ee130fdeeb 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/yang/opendaylight-binding-broker-impl.yang +++ b/opendaylight/md-sal/sal-binding-broker/src/main/yang/opendaylight-binding-broker-impl.yang @@ -70,6 +70,7 @@ module opendaylight-sal-binding-broker-impl { base config:module-type; config:provided-service binding-dom-mapping-service; config:provided-service sal:binding-codec-tree-factory; + config:provided-service sal:binding-normalized-node-serializer; config:java-name-prefix RuntimeMapping; } diff --git a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding.yang b/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding.yang index 81508d1b8f..18a94dfacd 100644 --- a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding.yang +++ b/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding.yang @@ -48,6 +48,11 @@ module opendaylight-md-sal-binding { config:java-class "org.opendaylight.yangtools.binding.data.codec.api.BindingCodecTreeFactory"; } + identity binding-normalized-node-serializer { + base "config:service-type"; + config:java-class "org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer"; + } + identity binding-notification-subscription-service { base "config:service-type"; config:java-class "org.opendaylight.controller.sal.binding.api.NotificationService"; -- 2.36.6