Enable spotbugs in mdsal-{binding,dom}-spi

[mdsal.git] / dom / mdsal-dom-spi / src / main / java / org / opendaylight / mdsal / dom / spi / shard / DOMDataTreeChangeListenerAggregator.java

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeChangeListenerAggregator.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeChangeListenerAggregator.java
index 97f3d28e3035c291277768f4d07e4f29dd126899..77a274f6936e0ab99ba81bd4391790f5e7eb598b 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeChangeListenerAggregator.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/shard/DOMDataTreeChangeListenerAggregator.java
@@ -7,8 +7,8 @@
  */
 package org.opendaylight.mdsal.dom.spi.shard;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
@@ -20,6 +20,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import javax.annotation.concurrent.GuardedBy;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
@@ -50,8 +51,8 @@ final class DOMDataTreeChangeListenerAggregator
         final List<DataTreeCandidate> changes;
 
         State(final DOMDataTreeIdentifier identifier, final List<DataTreeCandidate> changes) {
-            this.identifier = Preconditions.checkNotNull(identifier);
-            this.changes = Preconditions.checkNotNull(changes);
+            this.identifier = requireNonNull(identifier);
+            this.changes = requireNonNull(changes);
         }
 
         @Override
@@ -66,7 +67,7 @@ final class DOMDataTreeChangeListenerAggregator
         private final DOMDataTreeIdentifier identifier;
 
         StateBuilder(final DOMDataTreeIdentifier identifier) {
-            this.identifier = Preconditions.checkNotNull(identifier);
+            this.identifier = requireNonNull(identifier);
         }
 
         @Override
@@ -100,7 +101,7 @@ final class DOMDataTreeChangeListenerAggregator
         Operational(final Collection<AbstractStateAggregator.StateBuilder<State>> builders,
                 final DOMDataTreeListener listener) {
             super(builders);
-            this.listener = Preconditions.checkNotNull(listener);
+            this.listener = requireNonNull(listener);
         }
 
         @Override
@@ -129,7 +130,7 @@ final class DOMDataTreeChangeListenerAggregator
             if (size != 0) {
                 // Note: it is okay to leak changes, we must never leak mutable subtrees.
                 listener.onDataTreeChanged(changes, ImmutableMap.copyOf(subtrees));
-                LOG.trace("Listener {} processed {} changes in {}", listener, clock);
+                LOG.trace("Listener {} processed {} changes in {}", listener, size, clock);
             }
         }
     }