Migrate mdsal-trace-impl's use of BindingNormalizedNodeSerializer

We do not really need a full serializer here, it is eanough to get
an InstanceIdentifierCodec -- which is readily available from
BindingCodecTree.

JIRA: MDSAL-522
Change-Id: Ia82128b3579b562bb8ca7277072aee07a66a5e1e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/trace/mdsal-trace-impl/src/main/java/org/opendaylight/mdsal/trace/impl/TracingBroker.java b/trace/mdsal-trace-impl/src/main/java/org/opendaylight/mdsal/trace/impl/TracingBroker.java
index 5f60dc433d52582e3b5752289662de54a67c393b..1166c6a362b3c6171da96e53d774168656ecd931 100644 (file)
--- a/trace/mdsal-trace-impl/src/main/java/org/opendaylight/mdsal/trace/impl/TracingBroker.java
+++ b/trace/mdsal-trace-impl/src/main/java/org/opendaylight/mdsal/trace/impl/TracingBroker.java
@@ -16,7 +16,7 @@ import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
-import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.ClusteredDOMDataTreeChangeListener;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
@@ -102,7 +102,7 @@ public class TracingBroker implements TracingDOMDataBroker {
 
     private static final int STACK_TRACE_FIRST_RELEVANT_FRAME = 2;
 
-    private final BindingNormalizedNodeSerializer codec;
+    private final BindingCodecTree codec;
     private final DOMDataBroker delegate;
     private final List<Watch> registrationWatches = new ArrayList<>();
     private final List<Watch> writeWatches = new ArrayList<>();
@@ -162,8 +162,7 @@ public class TracingBroker implements TracingDOMDataBroker {
         }
     }
 
-    public TracingBroker(final DOMDataBroker delegate, final Config config,
-            final BindingNormalizedNodeSerializer codec) {
+    public TracingBroker(final DOMDataBroker delegate, final Config config, final BindingCodecTree codec) {
         this.delegate = requireNonNull(delegate, "delegate");
         this.codec = requireNonNull(codec, "codec");
         configure(config);
@@ -263,7 +262,7 @@ public class TracingBroker implements TracingDOMDataBroker {
 
 
     private void toPathString(final YangInstanceIdentifier yiid, final StringBuilder sb) {
-        InstanceIdentifier<?> iid = codec.fromYangInstanceIdentifier(yiid);
+        InstanceIdentifier<?> iid = codec.getInstanceIdentifierCodec().toBinding(yiid);
         if (null == iid) {
             reconstructIidPathString(yiid, sb);
         } else {

diff --git a/trace/mdsal-trace-impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/trace/mdsal-trace-impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 000398fc5c669ac8b4bba95bce056f2965ee35db..11314e2fdfebf5c28c025af1d20b5253740e20c1 100644 (file)
--- a/trace/mdsal-trace-impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/trace/mdsal-trace-impl/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -15,10 +15,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                             binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsaltrace.rev160908.Config">
   </odl:clustered-app-config>
 
-  <!-- FIXME: MDSAL-522: this should be BindingCodecTree, from which we need BindingInstanceIdentifierCodec -->
-  <reference id="codec"
-        interface="org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer"
-        odl:type="default" />
+  <reference id="codec" interface="org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree"/>
 
   <!-- Tracing Binding DataBroker -->
 

diff --git a/trace/mdsal-trace-impl/src/test/java/org/opendaylight/mdsal/trace/test/TracingBrokerTest.java b/trace/mdsal-trace-impl/src/test/java/org/opendaylight/mdsal/trace/test/TracingBrokerTest.java
index b98a90329599f20630f48c9c09780dc38dd45b0e..0326597be19275a2b342cc99f3e8f2c3a7e095bf 100644 (file)
--- a/trace/mdsal-trace-impl/src/test/java/org/opendaylight/mdsal/trace/test/TracingBrokerTest.java
+++ b/trace/mdsal-trace-impl/src/test/java/org/opendaylight/mdsal/trace/test/TracingBrokerTest.java
@@ -15,7 +15,7 @@ import static org.mockito.Mockito.mock;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import org.junit.Test;
-import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTree;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
 import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
@@ -36,7 +36,7 @@ public class TracingBrokerTest {
     public void testPrintOpenTransactions() {
         DOMDataBroker domDataBroker = mock(DOMDataBroker.class, RETURNS_DEEP_STUBS);
         Config config = new ConfigBuilder().setTransactionDebugContextEnabled(true).build();
-        BindingNormalizedNodeSerializer codec = mock(BindingNormalizedNodeSerializer.class);
+        BindingCodecTree codec = mock(BindingCodecTree.class);
         TracingBroker tracingBroker = new TracingBroker(domDataBroker, config, codec);
 
         for (int i = 0; i < 3; i++) {