X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=trace%2Fmdsal-trace-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Ftrace%2Fimpl%2FTracingBroker.java;h=1bcedd14b4b7574b1c42d4f650b2e744ead9f1fa;hb=11408d627adca7eb71ac956c3ad01f75b6b91596;hp=a997ef95efb2ccece244f73524c7ee522d26a486;hpb=3faeeab7827de81a50f7372b260827df1cc7f5bd;p=mdsal.git 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 a997ef95ef..1bcedd14b4 100644 --- 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,9 +102,7 @@ public class TracingBroker implements TracingDOMDataBroker { private static final int STACK_TRACE_FIRST_RELEVANT_FRAME = 2; - // "default" VS "pingpong" - private final String type; - private final BindingNormalizedNodeSerializer codec; + private final BindingCodecTree codec; private final DOMDataBroker delegate; private final List registrationWatches = new ArrayList<>(); private final List writeWatches = new ArrayList<>(); @@ -119,19 +117,18 @@ public class TracingBroker implements TracingDOMDataBroker { final String iidString; final LogicalDatastoreType store; - Watch(String iidString, LogicalDatastoreType storeOrNull) { + Watch(final String iidString, final LogicalDatastoreType storeOrNull) { this.store = storeOrNull; this.iidString = iidString; } - private String toIidCompString(YangInstanceIdentifier iid) { + private String toIidCompString(final YangInstanceIdentifier iid) { StringBuilder builder = new StringBuilder(); toPathString(iid, builder); - builder.append('/'); - return builder.toString(); + return builder.append('/').toString(); } - private boolean isParent(String parent, String child) { + private boolean isParent(final String parent, final String child) { int parentOffset = 0; if (parent.length() > 0 && parent.charAt(0) == '<') { parentOffset = parent.indexOf('>') + 1; @@ -146,7 +143,7 @@ public class TracingBroker implements TracingDOMDataBroker { } @SuppressWarnings({ "checkstyle:hiddenField", "hiding" }) - public boolean subtreesOverlap(YangInstanceIdentifier iid, LogicalDatastoreType store) { + public boolean subtreesOverlap(final YangInstanceIdentifier iid, final LogicalDatastoreType store) { if (this.store != null && !this.store.equals(store)) { return false; } @@ -156,7 +153,7 @@ public class TracingBroker implements TracingDOMDataBroker { } @SuppressWarnings({ "checkstyle:hiddenField", "hiding" }) - public boolean eventIsOfInterest(YangInstanceIdentifier iid, LogicalDatastoreType store) { + public boolean eventIsOfInterest(final YangInstanceIdentifier iid, final LogicalDatastoreType store) { if (this.store != null && !this.store.equals(store)) { return false; } @@ -165,17 +162,12 @@ public class TracingBroker implements TracingDOMDataBroker { } } - public TracingBroker(String type, DOMDataBroker delegate, Config config, BindingNormalizedNodeSerializer codec) { - this.type = requireNonNull(type, "type"); + 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); @@ -183,9 +175,9 @@ public class TracingBroker implements TracingDOMDataBroker { this.readWriteTransactionsRegistry = new CloseTrackedRegistry<>(db, "newReadWriteTransaction()", isDebugging); } - private void configure(Config config) { + private void configure(final Config config) { registrationWatches.clear(); - List paths = config.getRegistrationWatches(); + Set paths = config.getRegistrationWatches(); if (paths != null) { for (String path : paths) { watchRegistrations(path, null); @@ -206,7 +198,7 @@ public class TracingBroker implements TracingDOMDataBroker { * @param iidString the iid path of the root of the subtree * @param store Which LogicalDataStore? or null for both */ - public void watchRegistrations(String iidString, LogicalDatastoreType store) { + public void watchRegistrations(final String iidString, final LogicalDatastoreType store) { LOG.info("Watching registrations to {} in {}", iidString, store); registrationWatches.add(new Watch(iidString, store)); } @@ -216,15 +208,13 @@ public class TracingBroker implements TracingDOMDataBroker { * @param iidString the iid path of the root of the subtree * @param store Which LogicalDataStore? or null for both */ - public void watchWrites(String iidString, LogicalDatastoreType store) { + public void watchWrites(final String iidString, final LogicalDatastoreType store) { LOG.info("Watching writes to {} in {}", iidString, store); Watch watch = new Watch(iidString, store); writeWatches.add(watch); } - @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", - justification = "https://github.com/spotbugs/spotbugs/issues/811") - private boolean isRegistrationWatched(YangInstanceIdentifier iid, LogicalDatastoreType store) { + private boolean isRegistrationWatched(final YangInstanceIdentifier iid, final LogicalDatastoreType store) { if (registrationWatches.isEmpty()) { return true; } @@ -238,7 +228,7 @@ public class TracingBroker implements TracingDOMDataBroker { return false; } - boolean isWriteWatched(YangInstanceIdentifier iid, LogicalDatastoreType store) { + boolean isWriteWatched(final YangInstanceIdentifier iid, final LogicalDatastoreType store) { if (writeWatches.isEmpty()) { return true; } @@ -252,21 +242,21 @@ public class TracingBroker implements TracingDOMDataBroker { return false; } - static void toPathString(InstanceIdentifier iid, StringBuilder builder) { + static void toPathString(final InstanceIdentifier iid, final StringBuilder builder) { for (InstanceIdentifier.PathArgument pathArg : iid.getPathArguments()) { builder.append('/').append(pathArg.getType().getSimpleName()); } } - String toPathString(YangInstanceIdentifier yiid) { + String toPathString(final YangInstanceIdentifier yiid) { StringBuilder sb = new StringBuilder(); toPathString(yiid, sb); return sb.toString(); } - private void toPathString(YangInstanceIdentifier yiid, StringBuilder sb) { - InstanceIdentifier iid = codec.fromYangInstanceIdentifier(yiid); + private void toPathString(final YangInstanceIdentifier yiid, final StringBuilder sb) { + InstanceIdentifier iid = codec.getInstanceIdentifierCodec().toBinding(yiid); if (null == iid) { reconstructIidPathString(yiid, sb); } else { @@ -274,7 +264,7 @@ public class TracingBroker implements TracingDOMDataBroker { } } - private static void reconstructIidPathString(YangInstanceIdentifier yiid, StringBuilder sb) { + private static void reconstructIidPathString(final YangInstanceIdentifier yiid, final StringBuilder sb) { sb.append(""); for (YangInstanceIdentifier.PathArgument pathArg : yiid.getPathArguments()) { if (pathArg instanceof YangInstanceIdentifier.AugmentationIdentifier) { @@ -308,13 +298,14 @@ public class TracingBroker implements TracingDOMDataBroker { } @Override - public DOMTransactionChain createTransactionChain(DOMTransactionChainListener transactionChainListener) { + public DOMTransactionChain createTransactionChain(final DOMTransactionChainListener transactionChainListener) { return new TracingTransactionChain(delegate.createTransactionChain(transactionChainListener), this, transactionChainsRegistry); } @Override - public DOMTransactionChain createMergingTransactionChain(DOMTransactionChainListener transactionChainListener) { + public DOMTransactionChain createMergingTransactionChain( + final DOMTransactionChainListener transactionChainListener) { return new TracingTransactionChain(delegate.createMergingTransactionChain(transactionChainListener), this, transactionChainsRegistry); } @@ -336,7 +327,7 @@ public class TracingBroker implements TracingDOMDataBroker { res.put(DOMDataTreeChangeService.class, new DOMDataTreeChangeService() { @Override public ListenerRegistration registerDataTreeChangeListener( - DOMDataTreeIdentifier domDataTreeIdentifier, L listener) { + final DOMDataTreeIdentifier domDataTreeIdentifier, final L listener) { if (isRegistrationWatched(domDataTreeIdentifier.getRootIdentifier(), domDataTreeIdentifier.getDatastoreType())) { LOG.warn("{} registration (registerDataTreeChangeListener) for {} from {}.", @@ -351,18 +342,17 @@ public class TracingBroker implements TracingDOMDataBroker { } @Override - public boolean printOpenTransactions(PrintStream ps, int minOpenTXs) { + public boolean printOpenTransactions(final PrintStream ps, final int minOpenTXs) { if (transactionChainsRegistry.getAllUnique().isEmpty() && readOnlyTransactionsRegistry.getAllUnique().isEmpty() && writeTransactionsRegistry.getAllUnique().isEmpty() && readWriteTransactionsRegistry.getAllUnique().isEmpty()) { - ps.println(type + ": No open transactions, great!"); + ps.println("No open transactions, great!"); return false; } - ps.println(type + ": " + getClass().getSimpleName() - + " found some not yet (or never..) closed transaction[chain]s!"); + ps.println(getClass().getSimpleName() + " found some not yet (or never..) closed transaction[chain]s!"); ps.println("[NB: If no stack traces are shown below, then " + "enable transaction-debug-context-enabled in mdsaltrace_config.xml]"); ps.println(); @@ -394,8 +384,8 @@ public class TracingBroker implements TracingDOMDataBroker { return hasFound; } - private > boolean print( - CloseTrackedRegistry registry, PrintStream ps, String indent, int minOpenTransactions) { + private > boolean print(final CloseTrackedRegistry registry, final PrintStream ps, + final String indent, final int minOpenTransactions) { Set> unsorted = registry.getAllUnique(); if (unsorted.size() < minOpenTransactions) { return false; @@ -418,7 +408,8 @@ public class TracingBroker implements TracingDOMDataBroker { return true; } - private void printStackTraceElements(PrintStream ps, String indent, List stackTraceElements) { + private void printStackTraceElements(final PrintStream ps, final String indent, + final List stackTraceElements) { boolean ellipsis = false; for (final StackTraceElement stackTraceElement : stackTraceElements) { if (isStackTraceElementInteresting(stackTraceElement)) { @@ -431,7 +422,7 @@ public class TracingBroker implements TracingDOMDataBroker { } } - private boolean isStackTraceElementInteresting(StackTraceElement element) { + private boolean isStackTraceElementInteresting(final StackTraceElement element) { final String className = element.getClassName(); return !className.startsWith(getClass().getPackage().getName()) && !className.startsWith(CloseTracked.class.getPackage().getName())