From a5e4fc7ba428a5f95d3c45f31379b2e3a1497aa9 Mon Sep 17 00:00:00 2001 From: Jie Han Date: Mon, 28 Aug 2017 14:34:40 +0800 Subject: [PATCH] Binding codec v2 - fix anyxml #1 - Support Anyxml node codec Change-Id: Ic2ff67cf1be56f4e560b929cc695c329268d1d4e Signed-off-by: Jie Han --- .../spi/source/AbstractTreeNodeSerializerSource.java | 2 +- .../impl/serializer/BindingToNormalizedStreamWriter.java | 2 +- .../impl/serializer/ForwardingBindingStreamEventWriter.java | 4 ++-- .../binding/javav2/spec/runtime/BindingStreamEventWriter.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/spi/source/AbstractTreeNodeSerializerSource.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/spi/source/AbstractTreeNodeSerializerSource.java index 16675cf685..1153bed650 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/spi/source/AbstractTreeNodeSerializerSource.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/generator/spi/source/AbstractTreeNodeSerializerSource.java @@ -259,7 +259,7 @@ public abstract class AbstractTreeNodeSerializerSource extends AbstractSource { */ static final CharSequence anyxmlNode(final String name, final String value) throws IllegalArgumentException { - return invoke(STREAM, "anyxmlNode", escape(name), name); + return invoke(STREAM, "anyxmlNode", escape(name), value); } /** diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/BindingToNormalizedStreamWriter.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/BindingToNormalizedStreamWriter.java index 5ff5d35c1e..35313cd2d9 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/BindingToNormalizedStreamWriter.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/BindingToNormalizedStreamWriter.java @@ -151,7 +151,7 @@ public final class BindingToNormalizedStreamWriter } @Override - public void startAnyxmlNode(final String name, final Object value) throws IOException { + public void anyxmlNode(final String name, final Object value) throws IOException { final Entry dom = serializeLeaf(name, value); getDelegate().anyxmlNode(dom.getKey(), dom.getValue()); } diff --git a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/ForwardingBindingStreamEventWriter.java b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/ForwardingBindingStreamEventWriter.java index a3063c7f4f..29bb6e9a40 100644 --- a/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/ForwardingBindingStreamEventWriter.java +++ b/binding2/mdsal-binding2-dom-codec/src/main/java/org/opendaylight/mdsal/binding/javav2/dom/codec/impl/serializer/ForwardingBindingStreamEventWriter.java @@ -95,8 +95,8 @@ abstract class ForwardingBindingStreamEventWriter implements BindingStreamEventW } @Override - public void startAnyxmlNode(final String name, final Object value) throws IOException { - delegate().startAnyxmlNode(name, value); + public void anyxmlNode(final String name, final Object value) throws IOException { + delegate().anyxmlNode(name, value); } @Override diff --git a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/runtime/BindingStreamEventWriter.java b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/runtime/BindingStreamEventWriter.java index 9d08f2e296..0e67872e69 100644 --- a/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/runtime/BindingStreamEventWriter.java +++ b/binding2/mdsal-binding2-spec/src/main/java/org/opendaylight/mdsal/binding/javav2/spec/runtime/BindingStreamEventWriter.java @@ -56,7 +56,7 @@ import org.opendaylight.yangtools.concepts.Identifiable; * {@link #leafSetEntryNode(Object)}. * *
  • anyxml - Anyxml node event is emitted using - * {@link #startAnyxmlNode(String, Object)}. {@link #endNode()} MUST NOT be emitted + * {@link #anyxmlNode(String, Object)}. {@link #endNode()} MUST NOT be emitted * for anyxml node.
  • * *
  • anydata - Anydata node event is emitted using @@ -463,7 +463,7 @@ public interface BindingStreamEventWriter extends Closeable, Flushable { * choice unkeyed list node. * @throws IOException if an underlying IO error occurs */ - void startAnyxmlNode(String name, Object value) throws IOException; + void anyxmlNode(String name, Object value) throws IOException; /** * Emits anydata node event. -- 2.36.6