Fix checkstyle reported by odlparent-3.0.0

[controller.git] / opendaylight / md-sal / mdsal-trace / dom-impl / src / main / java / org / opendaylight / controller / md / sal / trace / dom / impl / TracingBroker.java

diff --git a/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingBroker.java b/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingBroker.java
index 84e8c02fadebd426587b71d18cb7b7a691e72686..d6b10396313ef4f13eb203f71870933ca50710a1 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingBroker.java
+++ b/opendaylight/md-sal/mdsal-trace/dom-impl/src/main/java/org/opendaylight/controller/md/sal/trace/dom/impl/TracingBroker.java
@@ -18,6 +18,7 @@ import javax.annotation.Nonnull;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
+import org.opendaylight.controller.md.sal.dom.api.ClusteredDOMDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBrokerExtension;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataChangeListener;
@@ -146,6 +147,7 @@ public class TracingBroker implements TracingDOMDataBroker {
             return child.startsWith(parent.substring(parentOffset), childOffset);
         }
 
+        @SuppressWarnings("checkstyle:hiddenField")
         public boolean subtreesOverlap(YangInstanceIdentifier iid, LogicalDatastoreType store,
                                                                 AsyncDataBroker.DataChangeScope scope) {
             if (this.store != null && !this.store.equals(store)) {
@@ -164,6 +166,7 @@ public class TracingBroker implements TracingDOMDataBroker {
             }
         }
 
+        @SuppressWarnings("checkstyle:hiddenField")
         public boolean eventIsOfInterest(YangInstanceIdentifier iid, LogicalDatastoreType store) {
             if (this.store != null && !this.store.equals(store)) {
                 return false;
@@ -353,7 +356,8 @@ public class TracingBroker implements TracingDOMDataBroker {
                     @Nonnull DOMDataTreeIdentifier domDataTreeIdentifier, @Nonnull L listener) {
                 if (isRegistrationWatched(domDataTreeIdentifier.getRootIdentifier(),
                         domDataTreeIdentifier.getDatastoreType(), DataChangeScope.SUBTREE)) {
-                    LOG.warn("Registration (registerDataTreeChangeListener) for {} from {}",
+                    LOG.warn("{} registration (registerDataTreeChangeListener) for {} from {}.",
+                            listener instanceof ClusteredDOMDataTreeChangeListener ? "Clustered" : "Non-clustered",
                             toPathString(domDataTreeIdentifier.getRootIdentifier()), getStackSummary());
                 }
                 return treeChangeSvc.registerDataTreeChangeListener(domDataTreeIdentifier, listener);
@@ -421,13 +425,16 @@ public class TracingBroker implements TracingDOMDataBroker {
     }
 
     private void printStackTraceElements(PrintStream ps, String indent, List<StackTraceElement> stackTraceElements) {
-        stackTraceElements.forEach(line -> {
-            if (isStackTraceElementInteresting(line)) {
-                ps.println(indent + line);
-            } else {
+        boolean ellipsis = false;
+        for (final StackTraceElement stackTraceElement : stackTraceElements) {
+            if (isStackTraceElementInteresting(stackTraceElement)) {
+                ps.println(indent + stackTraceElement);
+                ellipsis = false;
+            } else if (!ellipsis) {
                 ps.println(indent + "(...)");
+                ellipsis = true;
             }
-        });
+        }
     }
 
     private boolean isStackTraceElementInteresting(StackTraceElement element) {