Map system-ordered leaf-lists to Set<T>

[mdsal.git] / trace / mdsal-trace-impl / src / main / java / org / opendaylight / mdsal / trace / impl / TracingBroker.java

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..f3023e9a647518e1abfecd72a55233358c6ab8c0 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,17 +162,12 @@ 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);
 
-        if (config.isTransactionDebugContextEnabled() != null) {
-            this.isDebugging = config.isTransactionDebugContextEnabled();
-        } else {
-            this.isDebugging = false;
-        }
+        this.isDebugging = Boolean.TRUE.equals(config.getTransactionDebugContextEnabled());
         final String db = "DataBroker";
         this.transactionChainsRegistry     = new CloseTrackedRegistry<>(db, "createTransactionChain()", isDebugging);
         this.readOnlyTransactionsRegistry  = new CloseTrackedRegistry<>(db, "newReadOnlyTransaction()", isDebugging);
@@ -182,7 +177,7 @@ public class TracingBroker implements TracingDOMDataBroker {
 
     private void configure(final Config config) {
         registrationWatches.clear();
-        List<String> paths = config.getRegistrationWatches();
+        Set<String> paths = config.getRegistrationWatches();
         if (paths != null) {
             for (String path : paths) {
                 watchRegistrations(path, null);
@@ -263,7 +258,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 {