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>
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
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;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.mdsal.dom.api.ClusteredDOMDataTreeChangeListener;
import org.opendaylight.mdsal.dom.api.DOMDataBroker;
private static final int STACK_TRACE_FIRST_RELEVANT_FRAME = 2;
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<>();
private final DOMDataBroker delegate;
private final List<Watch> registrationWatches = new ArrayList<>();
private final List<Watch> writeWatches = new ArrayList<>();
- 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);
this.delegate = requireNonNull(delegate, "delegate");
this.codec = requireNonNull(codec, "codec");
configure(config);
private void toPathString(final YangInstanceIdentifier yiid, final StringBuilder sb) {
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 {
if (null == iid) {
reconstructIidPathString(yiid, sb);
} else {
binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsaltrace.rev160908.Config">
</odl:clustered-app-config>
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 -->
<!-- Tracing Binding DataBroker -->
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import org.junit.Test;
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;
import org.opendaylight.mdsal.dom.api.DOMDataBroker;
import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
import org.opendaylight.mdsal.dom.api.DOMTransactionChain;
public void testPrintOpenTransactions() {
DOMDataBroker domDataBroker = mock(DOMDataBroker.class, RETURNS_DEEP_STUBS);
Config config = new ConfigBuilder().setTransactionDebugContextEnabled(true).build();
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++) {
TracingBroker tracingBroker = new TracingBroker(domDataBroker, config, codec);
for (int i = 0; i < 3; i++) {