Binding codec v2 - fix anyxml #1

- Support Anyxml node codec
Change-Id: Ic2ff67cf1be56f4e560b929cc695c329268d1d4e
Signed-off-by: Jie Han <han.jie@zte.com.cn>

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 16675cf68548d9be31ff92e8fc57a946c7c059e6..1153bed65046874cd34c71013957b5582494db89 100644 (file)
--- 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 5ff5d35c1eafc527a9cb0daf962b57df298b56c6..35313cd2d9e31260a68ef0337913815601a58106 100644 (file)
--- 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<NodeIdentifier, Object> 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 a3063c7f4fd0058b31fc3764c9e7d6174ebfa19c..29bb6e9a40d13229d5114350056da44779612b97 100644 (file)
--- 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 9d08f2e296b80e6080252438380cf8ebeb544efd..0e67872e695ba361180637eeda94f5afc95924f4 100644 (file)
--- 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)}.
  *
  * <li><code>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.</code></li>
  *
  * <li><code>anydata - Anydata node event is emitted using
@@ -463,7 +463,7 @@ public interface BindingStreamEventWriter extends Closeable, Flushable {
      *             <code>choice</code> <code>unkeyed list</code> 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.